summaryrefslogtreecommitdiffstats
path: root/doc/jrummikub/model
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-07-06 16:36:06 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-07-06 16:36:06 +0200
commit51b7fbe822bd9a3804c061f0b844884769d7ddba (patch)
tree152d79321131936d1bc49e959d2a7a2628c592cb /doc/jrummikub/model
parent3193477354fc63477a3f42c94023fa84c129adf1 (diff)
downloadJRummikub-51b7fbe822bd9a3804c061f0b844884769d7ddba.tar
JRummikub-51b7fbe822bd9a3804c061f0b844884769d7ddba.zip
JavadocHEADmaster
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@609 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'doc/jrummikub/model')
-rw-r--r--doc/jrummikub/model/GameState.html255
-rw-r--r--doc/jrummikub/model/Hand.html233
-rw-r--r--doc/jrummikub/model/IHand.html156
-rw-r--r--doc/jrummikub/model/IPlayer.html206
-rw-r--r--doc/jrummikub/model/IStoneTray.html37
-rw-r--r--doc/jrummikub/model/ITable.html8
-rw-r--r--doc/jrummikub/model/Player.html354
-rw-r--r--doc/jrummikub/model/Position.html123
-rw-r--r--doc/jrummikub/model/Sizeable.html8
-rw-r--r--doc/jrummikub/model/Stone.html111
-rw-r--r--doc/jrummikub/model/StoneColor.html68
-rw-r--r--doc/jrummikub/model/StoneHeap.html71
-rw-r--r--doc/jrummikub/model/StoneSet.Type.html4
-rw-r--r--doc/jrummikub/model/StoneSet.html175
-rw-r--r--doc/jrummikub/model/StoneTray.Direction.html4
-rw-r--r--doc/jrummikub/model/StoneTray.html258
-rw-r--r--doc/jrummikub/model/Table.html142
-rw-r--r--doc/jrummikub/model/class-use/GameState.html175
-rw-r--r--doc/jrummikub/model/class-use/Hand.html4
-rw-r--r--doc/jrummikub/model/class-use/IHand.html100
-rw-r--r--doc/jrummikub/model/class-use/IPlayer.html192
-rw-r--r--doc/jrummikub/model/class-use/IStoneTray.html4
-rw-r--r--doc/jrummikub/model/class-use/ITable.html273
-rw-r--r--doc/jrummikub/model/class-use/Player.html42
-rw-r--r--doc/jrummikub/model/class-use/Position.html286
-rw-r--r--doc/jrummikub/model/class-use/Sizeable.html4
-rw-r--r--doc/jrummikub/model/class-use/Stone.html398
-rw-r--r--doc/jrummikub/model/class-use/StoneColor.html297
-rw-r--r--doc/jrummikub/model/class-use/StoneHeap.html28
-rw-r--r--doc/jrummikub/model/class-use/StoneSet.Type.html39
-rw-r--r--doc/jrummikub/model/class-use/StoneSet.html331
-rw-r--r--doc/jrummikub/model/class-use/StoneTray.Direction.html47
-rw-r--r--doc/jrummikub/model/class-use/StoneTray.html4
-rw-r--r--doc/jrummikub/model/class-use/Table.html4
-rw-r--r--doc/jrummikub/model/package-frame.html22
-rw-r--r--doc/jrummikub/model/package-summary.html46
-rw-r--r--doc/jrummikub/model/package-tree.html39
-rw-r--r--doc/jrummikub/model/package-use.html306
38 files changed, 4398 insertions, 456 deletions
diff --git a/doc/jrummikub/model/GameState.html b/doc/jrummikub/model/GameState.html
index b99ddf5..4a9e6ae 100644
--- a/doc/jrummikub/model/GameState.html
+++ b/doc/jrummikub/model/GameState.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
GameState
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,7 +55,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/GameState.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -76,9 +76,9 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -96,22 +96,65 @@ java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.GameState</B>
</PRE>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
</DL>
<HR>
<DL>
-<DT><PRE>public class <B>GameState</B><DT>extends java.lang.Object<DT>implements <A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></DL>
+<DT><PRE>public class <B>GameState</B><DT>extends java.lang.Object<DT>implements java.io.Serializable</DL>
</PRE>
<P>
-Class managing the overall and momentary GameState
+Class that stores information for a game of multiple rounds
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.GameState">Serialized Form</A></DL>
<HR>
<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#firstRoundFirstPlayer">firstRoundFirstPlayer</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#lastPlayerRedealed">lastPlayerRedealed</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.ArrayList&lt;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#scores">scores</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#serialVersionUID">serialVersionUID</A></B></CODE>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<A NAME="constructor_summary"><!-- --></A>
@@ -124,7 +167,7 @@ Class managing the overall and momentary GameState
<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#GameState()">GameState</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new GameState with an empty table and (currently) 4 new players.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
@@ -138,59 +181,60 @@ Class managing the overall and momentary GameState
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getActivePlayer()">getActivePlayer</A></B>()</CODE>
+<CODE>&nbsp;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getAccumulatedScore()">getAccumulatedScore</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the currently active player</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculated the accumulated score over the played rounds</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getGameHeap()">getGameHeap</A></B>()</CODE>
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getFirstRoundFirstPlayer()">getFirstRoundFirstPlayer</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the heap of stones to draw from</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the number of the first player of the first round</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getNthNextPlayer(int)">getNthNextPlayer</A></B>(int&nbsp;i)</CODE>
+<CODE>&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getLastPlayerRedealed()">getLastPlayerRedealed</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the player that would be the active player after i turns</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the player that has redealed last</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getPlayerCount()">getPlayerCount</A></B>()</CODE>
+<CODE>&nbsp;java.util.List&lt;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getScores()">getScores</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the number of players</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the list of players' scores in the rounds played before</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getTable()">getTable</A></B>()</CODE>
+<CODE>private &nbsp;java.lang.Boolean[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#getWinners(java.lang.Integer[], int[])">getWinners</A></B>(java.lang.Integer[]&nbsp;points,
+ int[]&nbsp;wins)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A></TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns whether players have won</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#nextPlayer()">nextPlayer</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#setFirstRoundFirstPlayer(int)">setFirstRoundFirstPlayer</A></B>(int&nbsp;firstRoundFirstPlayer)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Changes the activePlayer to the next <A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><CODE>Player</CODE></A> in the list</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the number of the first player of the first round</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#setTable(jrummikub.model.ITable)">setTable</A></B>(<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/GameState.html#setLastPlayerRedealed(jrummikub.model.PlayerSettings)">setLastPlayerRedealed</A></B>(<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&nbsp;lastPlayerRedealed)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the current <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A></TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the player that has redealed last</TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -205,6 +249,55 @@ Class managing the overall and momentary GameState
&nbsp;
<P>
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.GameState.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="firstRoundFirstPlayer"><!-- --></A><H3>
+firstRoundFirstPlayer</H3>
+<PRE>
+private int <B>firstRoundFirstPlayer</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="scores"><!-- --></A><H3>
+scores</H3>
+<PRE>
+private java.util.ArrayList&lt;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&gt; <B>scores</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="lastPlayerRedealed"><!-- --></A><H3>
+lastPlayerRedealed</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A> <B>lastPlayerRedealed</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -220,8 +313,6 @@ GameState</H3>
<PRE>
public <B>GameState</B>()</PRE>
<DL>
-<DD>Create a new GameState with an empty table and (currently) 4 new players.
-<P>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -234,126 +325,120 @@ public <B>GameState</B>()</PRE>
</TR>
</TABLE>
-<A NAME="getTable()"><!-- --></A><H3>
-getTable</H3>
+<A NAME="getFirstRoundFirstPlayer()"><!-- --></A><H3>
+getFirstRoundFirstPlayer</H3>
<PRE>
-public <A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A> <B>getTable</B>()</PRE>
+public int <B>getFirstRoundFirstPlayer</B>()</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#getTable()">IGameState</A></CODE></B></DD>
-<DD>Get the current <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A>
+<DD>Gets the number of the first player of the first round
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#getTable()">getTable</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-<DT><B>Returns:</B><DD>The current Table</DL>
+<DT><B>Returns:</B><DD>the number of the first player of the first round</DL>
</DD>
</DL>
<HR>
-<A NAME="setTable(jrummikub.model.ITable)"><!-- --></A><H3>
-setTable</H3>
+<A NAME="setFirstRoundFirstPlayer(int)"><!-- --></A><H3>
+setFirstRoundFirstPlayer</H3>
<PRE>
-public void <B>setTable</B>(<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</PRE>
+public void <B>setFirstRoundFirstPlayer</B>(int&nbsp;firstRoundFirstPlayer)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#setTable(jrummikub.model.ITable)">IGameState</A></CODE></B></DD>
-<DD>Sets the current <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A>
+<DD>Sets the number of the first player of the first round
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#setTable(jrummikub.model.ITable)">setTable</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>table</CODE> - The new Table</DL>
+<DT><B>Parameters:</B><DD><CODE>firstRoundFirstPlayer</CODE> - the number of the first player of the first round</DL>
</DD>
</DL>
<HR>
-<A NAME="getPlayerCount()"><!-- --></A><H3>
-getPlayerCount</H3>
+<A NAME="setLastPlayerRedealed(jrummikub.model.PlayerSettings)"><!-- --></A><H3>
+setLastPlayerRedealed</H3>
<PRE>
-public int <B>getPlayerCount</B>()</PRE>
+public void <B>setLastPlayerRedealed</B>(<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&nbsp;lastPlayerRedealed)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#getPlayerCount()">IGameState</A></CODE></B></DD>
-<DD>Returns the number of players
+<DD>Sets the player that has redealed last
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#getPlayerCount()">getPlayerCount</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-
-<DT><B>Returns:</B><DD>number of players</DL>
+<DT><B>Parameters:</B><DD><CODE>lastPlayerRedealed</CODE> - the player to set</DL>
</DD>
</DL>
<HR>
-<A NAME="nextPlayer()"><!-- --></A><H3>
-nextPlayer</H3>
+<A NAME="getLastPlayerRedealed()"><!-- --></A><H3>
+getLastPlayerRedealed</H3>
<PRE>
-public void <B>nextPlayer</B>()</PRE>
+public <A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A> <B>getLastPlayerRedealed</B>()</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#nextPlayer()">IGameState</A></CODE></B></DD>
-<DD>Changes the activePlayer to the next <A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><CODE>Player</CODE></A> in the list
+<DD>Returns the player that has redealed last
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#nextPlayer()">nextPlayer</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-</DL>
+
+<DT><B>Returns:</B><DD>the player</DL>
</DD>
</DL>
<HR>
-<A NAME="getNthNextPlayer(int)"><!-- --></A><H3>
-getNthNextPlayer</H3>
+<A NAME="getScores()"><!-- --></A><H3>
+getScores</H3>
<PRE>
-public <A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A> <B>getNthNextPlayer</B>(int&nbsp;i)</PRE>
+public java.util.List&lt;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&gt; <B>getScores</B>()</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#getNthNextPlayer(int)">IGameState</A></CODE></B></DD>
-<DD>Returns the player that would be the active player after i turns
+<DD>Returns the list of players' scores in the rounds played before
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#getNthNextPlayer(int)">getNthNextPlayer</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>i</CODE> - number of turns
-<DT><B>Returns:</B><DD>player active after i turns</DL>
+
+<DT><B>Returns:</B><DD>the list of scores</DL>
</DD>
</DL>
<HR>
-<A NAME="getActivePlayer()"><!-- --></A><H3>
-getActivePlayer</H3>
+<A NAME="getWinners(java.lang.Integer[], int[])"><!-- --></A><H3>
+getWinners</H3>
<PRE>
-public <A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A> <B>getActivePlayer</B>()</PRE>
+private java.lang.Boolean[] <B>getWinners</B>(java.lang.Integer[]&nbsp;points,
+ int[]&nbsp;wins)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#getActivePlayer()">IGameState</A></CODE></B></DD>
-<DD>Returns the currently active player
+<DD>Returns whether players have won
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#getActivePlayer()">getActivePlayer</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-
-<DT><B>Returns:</B><DD>currently active player</DL>
+<DT><B>Parameters:</B><DD><CODE>points</CODE> - the player's points<DD><CODE>wins</CODE> - the number of wins per player
+<DT><B>Returns:</B><DD>whether a player has won</DL>
</DD>
</DL>
<HR>
-<A NAME="getGameHeap()"><!-- --></A><H3>
-getGameHeap</H3>
+<A NAME="getAccumulatedScore()"><!-- --></A><H3>
+getAccumulatedScore</H3>
<PRE>
-public <A HREF="../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A> <B>getGameHeap</B>()</PRE>
+public <A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A> <B>getAccumulatedScore</B>()</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IGameState.html#getGameHeap()">IGameState</A></CODE></B></DD>
-<DD>Returns the heap of stones to draw from
+<DD>Calculated the accumulated score over the played rounds
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IGameState.html#getGameHeap()">getGameHeap</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></CODE></DL>
+</DL>
</DD>
<DD><DL>
-<DT><B>Returns:</B><DD>heap of stones</DL>
+<DT><B>Returns:</B><DD>the accumulated score</DL>
</DD>
</DL>
<!-- ========= END OF CLASS DATA ========= -->
@@ -387,7 +472,7 @@ public <A HREF="../../jrummikub/model/StoneHeap.html" title="class in jrummikub.
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/GameState.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -408,9 +493,9 @@ public <A HREF="../../jrummikub/model/StoneHeap.html" title="class in jrummikub.
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
diff --git a/doc/jrummikub/model/Hand.html b/doc/jrummikub/model/Hand.html
index 985907a..fdea6c2 100644
--- a/doc/jrummikub/model/Hand.html
+++ b/doc/jrummikub/model/Hand.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
Hand
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -56,7 +56,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Hand.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Hand.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -97,7 +97,7 @@ java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.Hand</B>
</PRE>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, <A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, <A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</DD>
</DL>
<HR>
<DL>
@@ -109,6 +109,8 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.Hand">Serialized Form</A></DL>
<HR>
<P>
@@ -141,11 +143,19 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#HEIGHT">HEIGHT</A></B></CODE>
+<CODE>private static&nbsp;java.util.Comparator&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#comparator">comparator</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The measure to compare the stones by</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#serialVersionUID">serialVersionUID</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The height of the hand</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -192,6 +202,14 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.util.TreeMap&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#countStones(java.util.List)">countStones</A></B>(java.util.List&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Counts the numbers of stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>protected &nbsp;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>,<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#fixInvalidDrop(jrummikub.model.Stone, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">fixInvalidDrop</A></B>(<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos,
@@ -201,6 +219,56 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Checks whether the object may be placed on the given position, computes
new position if not</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#getFreeRowSpace(int)">getFreeRowSpace</A></B>(int&nbsp;row)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the amount of free space in a hand row</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#getIdenticalStoneCount()">getIdenticalStoneCount</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Counts the pairs of identical stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#getRowCount()">getRowCount</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The number of used rows</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#getStonePoints(jrummikub.model.GameSettings)">getStonePoints</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the accumulated number of points of stones in the hand</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#incrementStoneCount(java.util.TreeMap, jrummikub.util.Pair)">incrementStoneCount</A></B>(java.util.TreeMap&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;&nbsp;stones,
+ <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&nbsp;stone)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Increments the count of a stone in the list of all stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Hand.html#isInitialMeldPossible(jrummikub.model.GameSettings)">isInitialMeldPossible</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tests whether it is possible to lay down an initial meld using the stones
+ on the hand</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_jrummikub.model.StoneTray"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -208,7 +276,7 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
<TH ALIGN="left"><B>Methods inherited from class jrummikub.model.<A HREF="../../jrummikub/model/StoneTray.html" title="class in jrummikub.model">StoneTray</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../jrummikub/model/StoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/StoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/StoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/StoneTray.html#iterator()">iterator</A>, <A HREF="../../jrummikub/model/StoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
+<TD><CODE><A HREF="../../jrummikub/model/StoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/StoneTray.html#contains(E)">contains</A>, <A HREF="../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/StoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/StoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/StoneTray.html#iterator()">iterator</A>, <A HREF="../../jrummikub/model/StoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -226,7 +294,7 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
<TH ALIGN="left"><B>Methods inherited from interface jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
+<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">contains</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Iterable"><!-- --></A>
@@ -251,6 +319,16 @@ Class managing a <A HREF="../../jrummikub/model/Player.html" title="class in jru
</TR>
</TABLE>
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.Hand.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
<A NAME="WIDTH"><!-- --></A><H3>
WIDTH</H3>
<PRE>
@@ -263,15 +341,15 @@ public static final int <B>WIDTH</B></PRE>
</DL>
<HR>
-<A NAME="HEIGHT"><!-- --></A><H3>
-HEIGHT</H3>
+<A NAME="comparator"><!-- --></A><H3>
+comparator</H3>
<PRE>
-public static final int <B>HEIGHT</B></PRE>
+private static final java.util.Comparator&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&gt; <B>comparator</B></PRE>
<DL>
-<DD>The height of the hand
+<DD>The measure to compare the stones by
<P>
<DL>
-<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.Hand.HEIGHT">Constant Field Values</A></DL>
+</DL>
</DL>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -301,6 +379,42 @@ public <B>Hand</B>()</PRE>
</TR>
</TABLE>
+<A NAME="getFreeRowSpace(int)"><!-- --></A><H3>
+getFreeRowSpace</H3>
+<PRE>
+public int <B>getFreeRowSpace</B>(int&nbsp;row)</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IHand.html#getFreeRowSpace(int)">IHand</A></CODE></B></DD>
+<DD>Gets the amount of free space in a hand row
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IHand.html#getFreeRowSpace(int)">getFreeRowSpace</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>row</CODE> - the row number
+<DT><B>Returns:</B><DD>the number of stones that can fit into the row</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getRowCount()"><!-- --></A><H3>
+getRowCount</H3>
+<PRE>
+public int <B>getRowCount</B>()</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IHand.html#getRowCount()">IHand</A></CODE></B></DD>
+<DD>The number of used rows
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IHand.html#getRowCount()">getRowCount</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the number of rows</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="fixInvalidDrop(jrummikub.model.Stone, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)"><!-- --></A><H3>
fixInvalidDrop</H3>
<PRE>
@@ -320,6 +434,95 @@ protected <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.uti
<DT><B>Returns:</B><DD>null if the drop is valid, new position otherwise</DL>
</DD>
</DL>
+<HR>
+
+<A NAME="getStonePoints(jrummikub.model.GameSettings)"><!-- --></A><H3>
+getStonePoints</H3>
+<PRE>
+public int <B>getStonePoints</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IHand.html#getStonePoints(jrummikub.model.GameSettings)">IHand</A></CODE></B></DD>
+<DD>Get the accumulated number of points of stones in the hand
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IHand.html#getStonePoints(jrummikub.model.GameSettings)">getStonePoints</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>points</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isInitialMeldPossible(jrummikub.model.GameSettings)"><!-- --></A><H3>
+isInitialMeldPossible</H3>
+<PRE>
+public boolean <B>isInitialMeldPossible</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IHand.html#isInitialMeldPossible(jrummikub.model.GameSettings)">IHand</A></CODE></B></DD>
+<DD>Tests whether it is possible to lay down an initial meld using the stones
+ on the hand
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IHand.html#isInitialMeldPossible(jrummikub.model.GameSettings)">isInitialMeldPossible</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>true if an initial meld is possible</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="incrementStoneCount(java.util.TreeMap, jrummikub.util.Pair)"><!-- --></A><H3>
+incrementStoneCount</H3>
+<PRE>
+private static void <B>incrementStoneCount</B>(java.util.TreeMap&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;&nbsp;stones,
+ <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&nbsp;stone)</PRE>
+<DL>
+<DD>Increments the count of a stone in the list of all stones
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>stones</CODE> - all stones and their respective numbers<DD><CODE>stone</CODE> - the start stone</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="countStones(java.util.List)"><!-- --></A><H3>
+countStones</H3>
+<PRE>
+private static <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.util.TreeMap&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;,java.lang.Integer&gt; <B>countStones</B>(java.util.List&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</PRE>
+<DL>
+<DD>Counts the numbers of stones
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>stones</CODE> - the stones to count
+<DT><B>Returns:</B><DD>the numbers for all stones</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getIdenticalStoneCount()"><!-- --></A><H3>
+getIdenticalStoneCount</H3>
+<PRE>
+public int <B>getIdenticalStoneCount</B>()</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IHand.html#getIdenticalStoneCount()">IHand</A></CODE></B></DD>
+<DD>Counts the pairs of identical stones
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IHand.html#getIdenticalStoneCount()">getIdenticalStoneCount</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>number of identical stone pairs</DL>
+</DD>
+</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
@@ -352,7 +555,7 @@ protected <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.uti
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Hand.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Hand.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/model/IHand.html b/doc/jrummikub/model/IHand.html
index 293f9ad..3c8ea74 100644
--- a/doc/jrummikub/model/IHand.html
+++ b/doc/jrummikub/model/IHand.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
IHand
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,7 +55,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/IHand.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -76,9 +76,9 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -92,7 +92,7 @@ jrummikub.model</FONT>
<BR>
Interface IHand</H2>
<DL>
-<DT><B>All Superinterfaces:</B> <DD>java.lang.Cloneable, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</DD>
+<DT><B>All Superinterfaces:</B> <DD>java.lang.Cloneable, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, java.io.Serializable</DD>
</DL>
<DL>
<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model">Hand</A></DD>
@@ -119,6 +119,47 @@ Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrum
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
<B>Method Summary</B></FONT></TH>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IHand.html#getFreeRowSpace(int)">getFreeRowSpace</A></B>(int&nbsp;row)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the amount of free space in a hand row</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IHand.html#getIdenticalStoneCount()">getIdenticalStoneCount</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Counts the pairs of identical stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IHand.html#getRowCount()">getRowCount</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The number of used rows</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IHand.html#getStonePoints(jrummikub.model.GameSettings)">getStonePoints</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the accumulated number of points of stones in the hand</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IHand.html#isInitialMeldPossible(jrummikub.model.GameSettings)">isInitialMeldPossible</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tests whether it is possible to lay down an initial meld using the stones
+ on the hand</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_jrummikub.model.IStoneTray"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -126,7 +167,7 @@ Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrum
<TH ALIGN="left"><B>Methods inherited from interface jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
+<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">contains</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Iterable"><!-- --></A>
@@ -140,6 +181,101 @@ Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrum
</TABLE>
&nbsp;
<P>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="getRowCount()"><!-- --></A><H3>
+getRowCount</H3>
+<PRE>
+int <B>getRowCount</B>()</PRE>
+<DL>
+<DD>The number of used rows
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the number of rows</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getFreeRowSpace(int)"><!-- --></A><H3>
+getFreeRowSpace</H3>
+<PRE>
+int <B>getFreeRowSpace</B>(int&nbsp;row)</PRE>
+<DL>
+<DD>Gets the amount of free space in a hand row
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>row</CODE> - the row number
+<DT><B>Returns:</B><DD>the number of stones that can fit into the row</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getStonePoints(jrummikub.model.GameSettings)"><!-- --></A><H3>
+getStonePoints</H3>
+<PRE>
+int <B>getStonePoints</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD>Get the accumulated number of points of stones in the hand
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>points</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isInitialMeldPossible(jrummikub.model.GameSettings)"><!-- --></A><H3>
+isInitialMeldPossible</H3>
+<PRE>
+boolean <B>isInitialMeldPossible</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD>Tests whether it is possible to lay down an initial meld using the stones
+ on the hand
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>true if an initial meld is possible</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getIdenticalStoneCount()"><!-- --></A><H3>
+getIdenticalStoneCount</H3>
+<PRE>
+int <B>getIdenticalStoneCount</B>()</PRE>
+<DL>
+<DD>Counts the pairs of identical stones
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>number of identical stone pairs</DL>
+</DD>
+</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
@@ -171,7 +307,7 @@ Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrum
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/IHand.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -192,9 +328,9 @@ Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrum
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;METHOD</FONT></TD>
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
diff --git a/doc/jrummikub/model/IPlayer.html b/doc/jrummikub/model/IPlayer.html
index 9e6e86d..38beef7 100644
--- a/doc/jrummikub/model/IPlayer.html
+++ b/doc/jrummikub/model/IPlayer.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
IPlayer
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -56,7 +56,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/IPlayer.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="IPlayer.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -92,11 +92,14 @@ jrummikub.model</FONT>
<BR>
Interface IPlayer</H2>
<DL>
+<DT><B>All Superinterfaces:</B> <DD>java.io.Serializable</DD>
+</DL>
+<DL>
<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model">Player</A></DD>
</DL>
<HR>
<DL>
-<DT><PRE>public interface <B>IPlayer</B></DL>
+<DT><PRE>public interface <B>IPlayer</B><DT>extends java.io.Serializable</DL>
</PRE>
<P>
@@ -118,27 +121,75 @@ Interface for <A HREF="../../jrummikub/model/Player.html" title="class in jrummi
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.awt.Color</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getColor()">getColor</A></B>()</CODE>
+<CODE>&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getHand()">getHand</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return the player's color</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current hand of the player</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getHand()">getHand</A></B>()</CODE>
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getLaidOut()">getLaidOut</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current hand of the player</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Has the player laid out yet?</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getLastTurnStoneCount()">getLastTurnStoneCount</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the number of stones put on table in player's last turn</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getPlayerSettings()">getPlayerSettings</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the player settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#setHand(jrummikub.model.IHand)">setHand</A></B>(<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set the current hand of the player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#setLaidOut(boolean)">setLaidOut</A></B>(boolean&nbsp;laidOut)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set if the player laid out</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#setLastTurnInvalid(boolean)">setLastTurnInvalid</A></B>(boolean&nbsp;value)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets last turn invalid</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#getName()">getName</A></B>()</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#setLastTurnStoneCount(int)">setLastTurnStoneCount</A></B>(int&nbsp;value)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return the name of the player</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the number of stones out on the table in player's last turn</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IPlayer.html#wasLastTurnInvalid()">wasLastTurnInvalid</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Getter for last turn invalid</TD>
</TR>
</TABLE>
&nbsp;
@@ -162,36 +213,143 @@ getHand</H3>
<DD>Get the current hand of the player
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Returns:</B><DD>the player's hand</DL>
</DD>
</DL>
<HR>
-<A NAME="getColor()"><!-- --></A><H3>
-getColor</H3>
+<A NAME="setHand(jrummikub.model.IHand)"><!-- --></A><H3>
+setHand</H3>
<PRE>
-java.awt.Color <B>getColor</B>()</PRE>
+void <B>setHand</B>(<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand)</PRE>
<DL>
-<DD>Return the player's color
+<DD>Set the current hand of the player
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>hand</CODE> - the new hand</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getLaidOut()"><!-- --></A><H3>
+getLaidOut</H3>
+<PRE>
+boolean <B>getLaidOut</B>()</PRE>
+<DL>
+<DD>Has the player laid out yet?
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
-<DT><B>Returns:</B><DD>the player's color</DL>
+<DT><B>Returns:</B><DD>if the player has laid out</DL>
</DD>
</DL>
<HR>
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
+<A NAME="getPlayerSettings()"><!-- --></A><H3>
+getPlayerSettings</H3>
<PRE>
-java.lang.String <B>getName</B>()</PRE>
+<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A> <B>getPlayerSettings</B>()</PRE>
<DL>
-<DD>Return the name of the player
+<DD>Returns the player settings
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
-<DT><B>Returns:</B><DD>the player's name</DL>
+<DT><B>Returns:</B><DD>the player settings</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setLaidOut(boolean)"><!-- --></A><H3>
+setLaidOut</H3>
+<PRE>
+void <B>setLaidOut</B>(boolean&nbsp;laidOut)</PRE>
+<DL>
+<DD>Set if the player laid out
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>laidOut</CODE> - the player laid out</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="wasLastTurnInvalid()"><!-- --></A><H3>
+wasLastTurnInvalid</H3>
+<PRE>
+boolean <B>wasLastTurnInvalid</B>()</PRE>
+<DL>
+<DD>Getter for last turn invalid
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>last turn invalid</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setLastTurnInvalid(boolean)"><!-- --></A><H3>
+setLastTurnInvalid</H3>
+<PRE>
+void <B>setLastTurnInvalid</B>(boolean&nbsp;value)</PRE>
+<DL>
+<DD>Sets last turn invalid
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>value</CODE> - last turn invalid</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getLastTurnStoneCount()"><!-- --></A><H3>
+getLastTurnStoneCount</H3>
+<PRE>
+int <B>getLastTurnStoneCount</B>()</PRE>
+<DL>
+<DD>Gets the number of stones put on table in player's last turn
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>number of stones</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setLastTurnStoneCount(int)"><!-- --></A><H3>
+setLastTurnStoneCount</H3>
+<PRE>
+void <B>setLastTurnStoneCount</B>(int&nbsp;value)</PRE>
+<DL>
+<DD>Sets the number of stones out on the table in player's last turn
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>value</CODE> - number of stones</DL>
</DD>
</DL>
<!-- ========= END OF CLASS DATA ========= -->
@@ -226,7 +384,7 @@ java.lang.String <B>getName</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/IPlayer.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="IPlayer.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/model/IStoneTray.html b/doc/jrummikub/model/IStoneTray.html
index f2a07c7..341c384 100644
--- a/doc/jrummikub/model/IStoneTray.html
+++ b/doc/jrummikub/model/IStoneTray.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
IStoneTray
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,7 +55,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/IStoneTray.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -94,7 +94,7 @@ Interface IStoneTray&lt;E extends <A HREF="../../jrummikub/model/Sizeable.html"
<DL>
<DT><DT><B>Type Parameters:</B><DD><CODE>E</CODE> - Objects held by the IStoneTray</DL>
<DL>
-<DT><B>All Superinterfaces:</B> <DD>java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;E,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</DD>
+<DT><B>All Superinterfaces:</B> <DD>java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;E,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, java.io.Serializable</DD>
</DL>
<DL>
<DT><B>All Known Subinterfaces:</B> <DD><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>, <A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></DD>
@@ -104,7 +104,7 @@ Interface IStoneTray&lt;E extends <A HREF="../../jrummikub/model/Sizeable.html"
</DL>
<HR>
<DL>
-<DT><PRE>public interface <B>IStoneTray&lt;E extends <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>&gt;</B><DT>extends java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;E,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, java.lang.Cloneable</DL>
+<DT><PRE>public interface <B>IStoneTray&lt;E extends <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>&gt;</B><DT>extends java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;E,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, java.lang.Cloneable, java.io.Serializable</DL>
</PRE>
<P>
@@ -134,6 +134,14 @@ Interface for the <A HREF="../../jrummikub/model/StoneTray.html" title="class in
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">contains</A></B>(<A HREF="../../jrummikub/model/IStoneTray.html" title="type parameter in IStoneTray">E</A>&nbsp;object)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Search for an object within the stone tray</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A></B>(<A HREF="../../jrummikub/model/IStoneTray.html" title="type parameter in IStoneTray">E</A>&nbsp;object,
<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position)</CODE>
@@ -271,6 +279,23 @@ int <B>getSize</B>()</PRE>
<DT><B>Returns:</B><DD>number of objects</DL>
</DD>
</DL>
+<HR>
+
+<A NAME="contains(jrummikub.model.Sizeable)"><!-- --></A><A NAME="contains(E)"><!-- --></A><H3>
+contains</H3>
+<PRE>
+boolean <B>contains</B>(<A HREF="../../jrummikub/model/IStoneTray.html" title="type parameter in IStoneTray">E</A>&nbsp;object)</PRE>
+<DL>
+<DD>Search for an object within the stone tray
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object</CODE> - object to search for
+<DT><B>Returns:</B><DD>object found in stone tray</DL>
+</DD>
+</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
@@ -302,7 +327,7 @@ int <B>getSize</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/IStoneTray.html" target="_top"><B>FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/model/ITable.html b/doc/jrummikub/model/ITable.html
index ea079ae..e753208 100644
--- a/doc/jrummikub/model/ITable.html
+++ b/doc/jrummikub/model/ITable.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
ITable
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -92,7 +92,7 @@ jrummikub.model</FONT>
<BR>
Interface ITable</H2>
<DL>
-<DT><B>All Superinterfaces:</B> <DD>java.lang.Cloneable, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</DD>
+<DT><B>All Superinterfaces:</B> <DD>java.lang.Cloneable, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, java.io.Serializable</DD>
</DL>
<DL>
<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model">Table</A></DD>
@@ -150,7 +150,7 @@ Interface for the <A HREF="../../jrummikub/model/Table.html" title="class in jru
<TH ALIGN="left"><B>Methods inherited from interface jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
+<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">contains</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Iterable"><!-- --></A>
diff --git a/doc/jrummikub/model/Player.html b/doc/jrummikub/model/Player.html
index a3f4e3d..d1aa71f 100644
--- a/doc/jrummikub/model/Player.html
+++ b/doc/jrummikub/model/Player.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
Player
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -56,7 +56,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Player.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Player.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -76,9 +76,9 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -96,7 +96,7 @@ java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.Player</B>
</PRE>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, <A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></DD>
</DL>
<HR>
<DL>
@@ -108,10 +108,69 @@ Class managing player data. No methods in release 1
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.Player">Serialized Form</A></DL>
<HR>
<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#hand">hand</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#laidOut">laidOut</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#lastTurnInvalid">lastTurnInvalid</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#lastTurnStoneCount">lastTurnStoneCount</A></B></CODE>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#settings">settings</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<A NAME="constructor_summary"><!-- --></A>
@@ -121,8 +180,7 @@ Class managing player data. No methods in release 1
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#Player(java.lang.String, java.awt.Color)">Player</A></B>(java.lang.String&nbsp;name,
- java.awt.Color&nbsp;color)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#Player(jrummikub.model.PlayerSettings)">Player</A></B>(<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&nbsp;settings)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new player with a given name and color</TD>
@@ -139,27 +197,75 @@ Class managing player data. No methods in release 1
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.awt.Color</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getColor()">getColor</A></B>()</CODE>
+<CODE>&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getHand()">getHand</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return the player's color</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current hand of the player</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getHand()">getHand</A></B>()</CODE>
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getLaidOut()">getLaidOut</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current hand of the player</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Has the player laid out yet?</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getName()">getName</A></B>()</CODE>
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getLastTurnStoneCount()">getLastTurnStoneCount</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return the name of the player</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the number of stones put on table in player's last turn</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#getPlayerSettings()">getPlayerSettings</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the player settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#setHand(jrummikub.model.IHand)">setHand</A></B>(<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set the current hand of the player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#setLaidOut(boolean)">setLaidOut</A></B>(boolean&nbsp;laidOut)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set if the player laid out</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#setLastTurnInvalid(boolean)">setLastTurnInvalid</A></B>(boolean&nbsp;value)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets last turn invalid</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#setLastTurnStoneCount(int)">setLastTurnStoneCount</A></B>(int&nbsp;value)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the number of stones out on the table in player's last turn</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Player.html#wasLastTurnInvalid()">wasLastTurnInvalid</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Getter for last turn invalid</TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -174,6 +280,75 @@ Class managing player data. No methods in release 1
&nbsp;
<P>
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.Player.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="settings"><!-- --></A><H3>
+settings</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A> <B>settings</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="hand"><!-- --></A><H3>
+hand</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A> <B>hand</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="laidOut"><!-- --></A><H3>
+laidOut</H3>
+<PRE>
+private boolean <B>laidOut</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="lastTurnInvalid"><!-- --></A><H3>
+lastTurnInvalid</H3>
+<PRE>
+private boolean <B>lastTurnInvalid</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="lastTurnStoneCount"><!-- --></A><H3>
+lastTurnStoneCount</H3>
+<PRE>
+private int <B>lastTurnStoneCount</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -184,16 +359,15 @@ Class managing player data. No methods in release 1
</TR>
</TABLE>
-<A NAME="Player(java.lang.String, java.awt.Color)"><!-- --></A><H3>
+<A NAME="Player(jrummikub.model.PlayerSettings)"><!-- --></A><H3>
Player</H3>
<PRE>
-public <B>Player</B>(java.lang.String&nbsp;name,
- java.awt.Color&nbsp;color)</PRE>
+public <B>Player</B>(<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&nbsp;settings)</PRE>
<DL>
<DD>Create a new player with a given name and color
<P>
<DL>
-<DT><B>Parameters:</B><DD><CODE>name</CODE> - player name<DD><CODE>color</CODE> - player's color</DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - the player settings</DL>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -224,38 +398,142 @@ public <A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.
</DL>
<HR>
-<A NAME="getColor()"><!-- --></A><H3>
-getColor</H3>
+<A NAME="setHand(jrummikub.model.IHand)"><!-- --></A><H3>
+setHand</H3>
<PRE>
-public java.awt.Color <B>getColor</B>()</PRE>
+public void <B>setHand</B>(<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#getColor()">IPlayer</A></CODE></B></DD>
-<DD>Return the player's color
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#setHand(jrummikub.model.IHand)">IPlayer</A></CODE></B></DD>
+<DD>Set the current hand of the player
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#getColor()">getColor</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#setHand(jrummikub.model.IHand)">setHand</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
</DD>
<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>hand</CODE> - the new hand</DL>
+</DD>
+</DL>
+<HR>
-<DT><B>Returns:</B><DD>the player's color</DL>
+<A NAME="getLaidOut()"><!-- --></A><H3>
+getLaidOut</H3>
+<PRE>
+public boolean <B>getLaidOut</B>()</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#getLaidOut()">IPlayer</A></CODE></B></DD>
+<DD>Has the player laid out yet?
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#getLaidOut()">getLaidOut</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>if the player has laid out</DL>
</DD>
</DL>
<HR>
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
+<A NAME="setLaidOut(boolean)"><!-- --></A><H3>
+setLaidOut</H3>
<PRE>
-public java.lang.String <B>getName</B>()</PRE>
+public void <B>setLaidOut</B>(boolean&nbsp;laidOut)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#getName()">IPlayer</A></CODE></B></DD>
-<DD>Return the name of the player
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#setLaidOut(boolean)">IPlayer</A></CODE></B></DD>
+<DD>Set if the player laid out
<P>
<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#getName()">getName</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#setLaidOut(boolean)">setLaidOut</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
</DD>
<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>laidOut</CODE> - the player laid out</DL>
+</DD>
+</DL>
+<HR>
-<DT><B>Returns:</B><DD>the player's name</DL>
+<A NAME="getPlayerSettings()"><!-- --></A><H3>
+getPlayerSettings</H3>
+<PRE>
+public <A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A> <B>getPlayerSettings</B>()</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#getPlayerSettings()">IPlayer</A></CODE></B></DD>
+<DD>Returns the player settings
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#getPlayerSettings()">getPlayerSettings</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the player settings</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="wasLastTurnInvalid()"><!-- --></A><H3>
+wasLastTurnInvalid</H3>
+<PRE>
+public boolean <B>wasLastTurnInvalid</B>()</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#wasLastTurnInvalid()">IPlayer</A></CODE></B></DD>
+<DD>Getter for last turn invalid
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#wasLastTurnInvalid()">wasLastTurnInvalid</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>last turn invalid</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setLastTurnInvalid(boolean)"><!-- --></A><H3>
+setLastTurnInvalid</H3>
+<PRE>
+public void <B>setLastTurnInvalid</B>(boolean&nbsp;value)</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#setLastTurnInvalid(boolean)">IPlayer</A></CODE></B></DD>
+<DD>Sets last turn invalid
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#setLastTurnInvalid(boolean)">setLastTurnInvalid</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>value</CODE> - last turn invalid</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getLastTurnStoneCount()"><!-- --></A><H3>
+getLastTurnStoneCount</H3>
+<PRE>
+public int <B>getLastTurnStoneCount</B>()</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#getLastTurnStoneCount()">IPlayer</A></CODE></B></DD>
+<DD>Gets the number of stones put on table in player's last turn
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#getLastTurnStoneCount()">getLastTurnStoneCount</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>number of stones</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setLastTurnStoneCount(int)"><!-- --></A><H3>
+setLastTurnStoneCount</H3>
+<PRE>
+public void <B>setLastTurnStoneCount</B>(int&nbsp;value)</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IPlayer.html#setLastTurnStoneCount(int)">IPlayer</A></CODE></B></DD>
+<DD>Sets the number of stones out on the table in player's last turn
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IPlayer.html#setLastTurnStoneCount(int)">setLastTurnStoneCount</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>value</CODE> - number of stones</DL>
</DD>
</DL>
<!-- ========= END OF CLASS DATA ========= -->
@@ -290,7 +568,7 @@ public java.lang.String <B>getName</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Player.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Player.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -310,9 +588,9 @@ public java.lang.String <B>getName</B>()</PRE>
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
diff --git a/doc/jrummikub/model/Position.html b/doc/jrummikub/model/Position.html
index 80f96fd..5a369cb 100644
--- a/doc/jrummikub/model/Position.html
+++ b/doc/jrummikub/model/Position.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
Position
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,8 +55,8 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.Type.html" title="enum in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Position.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Position.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -76,9 +76,9 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -95,9 +95,12 @@ Class Position</H2>
java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.Position</B>
</PRE>
+<DL>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
+</DL>
<HR>
<DL>
-<DT><PRE>public class <B>Position</B><DT>extends java.lang.Object</DL>
+<DT><PRE>public class <B>Position</B><DT>extends java.lang.Object<DT>implements java.io.Serializable</DL>
</PRE>
<P>
@@ -106,10 +109,45 @@ java.lang.Object
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.Position">Serialized Form</A></DL>
<HR>
<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;double</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#x">x</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;double</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#y">y</A></B></CODE>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<A NAME="constructor_summary"><!-- --></A>
@@ -119,8 +157,8 @@ java.lang.Object
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#Position(float, float)">Position</A></B>(float&nbsp;x,
- float&nbsp;y)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#Position(double, double)">Position</A></B>(double&nbsp;x,
+ double&nbsp;y)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new position by specifying the coordinates</TD>
@@ -145,7 +183,7 @@ java.lang.Object
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;float</CODE></FONT></TD>
+<CODE>&nbsp;double</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#getX()">getX</A></B>()</CODE>
<BR>
@@ -153,7 +191,7 @@ java.lang.Object
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;float</CODE></FONT></TD>
+<CODE>&nbsp;double</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/Position.html#getY()">getY</A></B>()</CODE>
<BR>
@@ -188,6 +226,45 @@ java.lang.Object
&nbsp;
<P>
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.Position.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="x"><!-- --></A><H3>
+x</H3>
+<PRE>
+private double <B>x</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="y"><!-- --></A><H3>
+y</H3>
+<PRE>
+private double <B>y</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -198,11 +275,11 @@ java.lang.Object
</TR>
</TABLE>
-<A NAME="Position(float, float)"><!-- --></A><H3>
+<A NAME="Position(double, double)"><!-- --></A><H3>
Position</H3>
<PRE>
-public <B>Position</B>(float&nbsp;x,
- float&nbsp;y)</PRE>
+public <B>Position</B>(double&nbsp;x,
+ double&nbsp;y)</PRE>
<DL>
<DD>Create a new position by specifying the coordinates
<P>
@@ -223,11 +300,14 @@ public <B>Position</B>(float&nbsp;x,
<A NAME="getX()"><!-- --></A><H3>
getX</H3>
<PRE>
-public float <B>getX</B>()</PRE>
+public double <B>getX</B>()</PRE>
<DL>
<DD>Get the x coordinate of the position
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Returns:</B><DD>x coordinate</DL>
</DD>
@@ -237,11 +317,14 @@ public float <B>getX</B>()</PRE>
<A NAME="getY()"><!-- --></A><H3>
getY</H3>
<PRE>
-public float <B>getY</B>()</PRE>
+public double <B>getY</B>()</PRE>
<DL>
<DD>Get the y coordinate of the position
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Returns:</B><DD>y coordinate</DL>
</DD>
@@ -319,8 +402,8 @@ public int <B>hashCode</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/PlayerSettings.Type.html" title="enum in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Position.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Position.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -340,9 +423,9 @@ public int <B>hashCode</B>()</PRE>
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
diff --git a/doc/jrummikub/model/Sizeable.html b/doc/jrummikub/model/Sizeable.html
index f6a2942..2ca5dcf 100644
--- a/doc/jrummikub/model/Sizeable.html
+++ b/doc/jrummikub/model/Sizeable.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:57 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
Sizeable
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,7 +55,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Sizeable.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -205,7 +205,7 @@ float <B>getHeight</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Sizeable.html" target="_top"><B>FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/model/Stone.html b/doc/jrummikub/model/Stone.html
index 97fafb2..6f694c5 100644
--- a/doc/jrummikub/model/Stone.html
+++ b/doc/jrummikub/model/Stone.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
Stone
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -76,9 +76,9 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -96,11 +96,11 @@ java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.Stone</B>
</PRE>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A></DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A></DD>
</DL>
<HR>
<DL>
-<DT><PRE>public class <B>Stone</B><DT>extends java.lang.Object<DT>implements <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A></DL>
+<DT><PRE>public class <B>Stone</B><DT>extends java.lang.Object<DT>implements <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>, java.io.Serializable</DL>
</PRE>
<P>
@@ -108,10 +108,53 @@ Basic Rummikub Stone
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.Stone">Serialized Form</A></DL>
<HR>
<P>
+<!-- =========== FIELD SUMMARY =========== -->
+
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Stone.html#color">color</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Stone.html#joker">joker</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Stone.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Stone.html#value">value</A></B></CODE>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<A NAME="constructor_summary"><!-- --></A>
@@ -204,6 +247,55 @@ Basic Rummikub Stone
&nbsp;
<P>
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.Stone.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="value"><!-- --></A><H3>
+value</H3>
+<PRE>
+private int <B>value</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="color"><!-- --></A><H3>
+color</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> <B>color</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="joker"><!-- --></A><H3>
+joker</H3>
+<PRE>
+private final boolean <B>joker</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -219,8 +311,7 @@ Stone</H3>
<PRE>
public <B>Stone</B>(<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&nbsp;color)</PRE>
<DL>
-<DD>Creates a joker of the given color. The color is only used for
- displaying.
+<DD>Creates a joker of the given color. The color is only used for displaying.
<P>
<DL>
<DT><B>Parameters:</B><DD><CODE>color</CODE> - joker color</DL>
@@ -400,9 +491,9 @@ public java.lang.String <B>toString</B>()</PRE>
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
diff --git a/doc/jrummikub/model/StoneColor.html b/doc/jrummikub/model/StoneColor.html
index 800023b..6921c5c 100644
--- a/doc/jrummikub/model/StoneColor.html
+++ b/doc/jrummikub/model/StoneColor.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
StoneColor
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -121,6 +121,12 @@ Class specifying possible StoneColors
<B>Enum Constant Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneColor.html#AQUA">AQUA</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><CODE><B><A HREF="../../jrummikub/model/StoneColor.html#BLACK">BLACK</A></B></CODE>
<BR>
@@ -133,6 +139,18 @@ Class specifying possible StoneColors
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneColor.html#GRAY">GRAY</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneColor.html#GREEN">GREEN</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><CODE><B><A HREF="../../jrummikub/model/StoneColor.html#ORANGE">ORANGE</A></B></CODE>
<BR>
@@ -144,6 +162,12 @@ Class specifying possible StoneColors
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneColor.html#VIOLET">VIOLET</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<!-- ========== METHOD SUMMARY =========== -->
@@ -241,6 +265,46 @@ public static final <A HREF="../../jrummikub/model/StoneColor.html" title="enum
<DL>
</DL>
</DL>
+<HR>
+
+<A NAME="GREEN"><!-- --></A><H3>
+GREEN</H3>
+<PRE>
+public static final <A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> <B>GREEN</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="VIOLET"><!-- --></A><H3>
+VIOLET</H3>
+<PRE>
+public static final <A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> <B>VIOLET</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="AQUA"><!-- --></A><H3>
+AQUA</H3>
+<PRE>
+public static final <A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> <B>AQUA</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="GRAY"><!-- --></A><H3>
+GRAY</H3>
+<PRE>
+public static final <A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> <B>GRAY</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
<!-- ============ METHOD DETAIL ========== -->
diff --git a/doc/jrummikub/model/StoneHeap.html b/doc/jrummikub/model/StoneHeap.html
index 35429a0..e0eb1ee 100644
--- a/doc/jrummikub/model/StoneHeap.html
+++ b/doc/jrummikub/model/StoneHeap.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
StoneHeap
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -95,9 +95,12 @@ Class StoneHeap</H2>
java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.StoneHeap</B>
</PRE>
+<DL>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
+</DL>
<HR>
<DL>
-<DT><PRE>public class <B>StoneHeap</B><DT>extends java.lang.Object</DL>
+<DT><PRE>public class <B>StoneHeap</B><DT>extends java.lang.Object<DT>implements java.io.Serializable</DL>
</PRE>
<P>
@@ -106,6 +109,8 @@ StoneHeap creates all <A HREF="../../jrummikub/model/Stone.html" title="class in
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.StoneHeap">Serialized Form</A></DL>
<HR>
<P>
@@ -119,12 +124,28 @@ StoneHeap creates all <A HREF="../../jrummikub/model/Stone.html" title="class in
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>(package private) &nbsp;java.util.List&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<CODE>private &nbsp;java.util.Random</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneHeap.html#generator">generator</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;java.util.ArrayList&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneHeap.html#heap">heap</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneHeap.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -136,7 +157,7 @@ StoneHeap creates all <A HREF="../../jrummikub/model/Stone.html" title="class in
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/model/StoneHeap.html#StoneHeap()">StoneHeap</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneHeap.html#StoneHeap(jrummikub.model.GameSettings)">StoneHeap</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;gameSettings)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates 106 Stones according to standard rules</TD>
@@ -206,10 +227,30 @@ StoneHeap creates all <A HREF="../../jrummikub/model/Stone.html" title="class in
</TR>
</TABLE>
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.StoneHeap.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
<A NAME="heap"><!-- --></A><H3>
heap</H3>
<PRE>
-java.util.List&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt; <B>heap</B></PRE>
+java.util.ArrayList&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt; <B>heap</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="generator"><!-- --></A><H3>
+generator</H3>
+<PRE>
+private java.util.Random <B>generator</B></PRE>
<DL>
<DL>
</DL>
@@ -225,13 +266,15 @@ java.util.List&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jru
</TR>
</TABLE>
-<A NAME="StoneHeap()"><!-- --></A><H3>
+<A NAME="StoneHeap(jrummikub.model.GameSettings)"><!-- --></A><H3>
StoneHeap</H3>
<PRE>
-public <B>StoneHeap</B>()</PRE>
+public <B>StoneHeap</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;gameSettings)</PRE>
<DL>
<DD>Creates 106 Stones according to standard rules
<P>
+<DL>
+<DT><B>Parameters:</B><DD><CODE>gameSettings</CODE> - (for number of sets/jokers, colors etc.)</DL>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -252,6 +295,9 @@ public <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.mode
<DD>Removes random <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A> from the heap and returns it
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Returns:</B><DD>the drawn stone</DL>
</DD>
@@ -266,6 +312,9 @@ public java.util.List&lt;<A HREF="../../jrummikub/model/Stone.html" title="class
<DD>Removes several <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A>s from the heap and returns them
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Parameters:</B><DD><CODE>number</CODE> - number of requested Stones
<DT><B>Returns:</B><DD>list of drawn stones</DL>
</DD>
@@ -280,6 +329,9 @@ public int <B>getSize</B>()</PRE>
<DD>Get the number of stones left
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Returns:</B><DD>number of stones on the heap</DL>
</DD>
@@ -294,6 +346,9 @@ public void <B>putBack</B>(java.util.Collection&lt;<A HREF="../../jrummikub/mode
<DD>Put stones back on the heap
<P>
<DD><DL>
+</DL>
+</DD>
+<DD><DL>
<DT><B>Parameters:</B><DD><CODE>stones</CODE> - collection of stones to put back</DL>
</DD>
</DL>
diff --git a/doc/jrummikub/model/StoneSet.Type.html b/doc/jrummikub/model/StoneSet.Type.html
index a4617a3..acb65e2 100644
--- a/doc/jrummikub/model/StoneSet.Type.html
+++ b/doc/jrummikub/model/StoneSet.Type.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
StoneSet.Type
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/StoneSet.html b/doc/jrummikub/model/StoneSet.html
index c476ebe..0cf4073 100644
--- a/doc/jrummikub/model/StoneSet.html
+++ b/doc/jrummikub/model/StoneSet.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
StoneSet
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -96,11 +96,11 @@ java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.StoneSet</B>
</PRE>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Iterable&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;, <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A></DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Iterable&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;, <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A></DD>
</DL>
<HR>
<DL>
-<DT><PRE>public class <B>StoneSet</B><DT>extends java.lang.Object<DT>implements java.lang.Iterable&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;, <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A></DL>
+<DT><PRE>public class <B>StoneSet</B><DT>extends java.lang.Object<DT>implements java.lang.Iterable&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;, <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>, java.io.Serializable</DL>
</PRE>
<P>
@@ -108,6 +108,8 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.StoneSet">Serialized Form</A></DL>
<HR>
<P>
@@ -146,6 +148,22 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.ArrayList&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#stones">stones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>(package private) static&nbsp;float</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#VERTICAL_BORDER">VERTICAL_BORDER</A></B></CODE>
@@ -186,12 +204,21 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#classify()">classify</A></B>()</CODE>
+<CODE>&nbsp;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A>,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#classify(jrummikub.model.GameSettings)">classify</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet and determine whether the set
- is a group or a run</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet and determine whether the set is
+ a group or a run</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A>,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#classifyJokersOnly(jrummikub.model.GameSettings)">classifyJokersOnly</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within a StoneSet with jokers only and determine
+ whether the set is a group or a run</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -211,6 +238,14 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#getSize()">getSize</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the number of stones in the set.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;float</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#getWidth()">getWidth</A></B>()</CODE>
@@ -220,13 +255,31 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#isValid()">isValid</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#isValid(jrummikub.model.GameSettings)">isValid</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#isValidGroup(int, jrummikub.model.GameSettings)">isValidGroup</A></B>(int&nbsp;value,
+ <A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet, assuming we have a group</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#isValidRun(int, jrummikub.model.GameSettings)">isValidRun</A></B>(int&nbsp;referencePosition,
+ <A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet, assuming we have a run</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;java.util.Iterator&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#iterator()">iterator</A></B>()</CODE>
@@ -243,14 +296,6 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#size()">size</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the number of stones in the set.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneSet.html#splitAt(int)">splitAt</A></B>(int&nbsp;position)</CODE>
@@ -289,6 +334,16 @@ Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummi
</TR>
</TABLE>
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.StoneSet.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
<A NAME="VERTICAL_BORDER"><!-- --></A><H3>
VERTICAL_BORDER</H3>
<PRE>
@@ -307,6 +362,16 @@ static final float <B>HORIZONTAL_BORDER</B></PRE>
<DL>
<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.StoneSet.HORIZONTAL_BORDER">Constant Field Values</A></DL>
</DL>
+<HR>
+
+<A NAME="stones"><!-- --></A><H3>
+stones</H3>
+<PRE>
+private java.util.ArrayList&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt; <B>stones</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -351,10 +416,10 @@ public <B>StoneSet</B>(java.util.List&lt;<A HREF="../../jrummikub/model/Stone.ht
</TR>
</TABLE>
-<A NAME="isValid()"><!-- --></A><H3>
+<A NAME="isValid(jrummikub.model.GameSettings)"><!-- --></A><H3>
isValid</H3>
<PRE>
-public boolean <B>isValid</B>()</PRE>
+public boolean <B>isValid</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
<DL>
<DD>Test for rule conflict within the StoneSet
<P>
@@ -362,26 +427,80 @@ public boolean <B>isValid</B>()</PRE>
</DL>
</DD>
<DD><DL>
-
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - GameSettings
<DT><B>Returns:</B><DD>true when the set is valid according to the rules</DL>
</DD>
</DL>
<HR>
-<A NAME="classify()"><!-- --></A><H3>
+<A NAME="classify(jrummikub.model.GameSettings)"><!-- --></A><H3>
classify</H3>
<PRE>
-public <A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A> <B>classify</B>()</PRE>
+public <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A>,java.lang.Integer&gt; <B>classify</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD>Test for rule conflict within the StoneSet and determine whether the set is
+ a group or a run
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - GameSettings
+<DT><B>Returns:</B><DD>GROUP or RUN for valid sets, INVALID otherwise and the points</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="classifyJokersOnly(jrummikub.model.GameSettings)"><!-- --></A><H3>
+classifyJokersOnly</H3>
+<PRE>
+private <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A>,java.lang.Integer&gt; <B>classifyJokersOnly</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD>Test for rule conflict within a StoneSet with jokers only and determine
+ whether the set is a group or a run
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>GROUP or RUN for valid sets, INVALID otherwise and the points</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isValidRun(int, jrummikub.model.GameSettings)"><!-- --></A><H3>
+isValidRun</H3>
+<PRE>
+private int <B>isValidRun</B>(int&nbsp;referencePosition,
+ <A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
<DL>
-<DD>Test for rule conflict within the StoneSet and determine whether the set
- is a group or a run
+<DD>Test for rule conflict within the StoneSet, assuming we have a run
<P>
<DD><DL>
</DL>
</DD>
<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>referencePosition</CODE> - position of stone used as reference (any non-joker stone)<DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>the set's points</DL>
+</DD>
+</DL>
+<HR>
-<DT><B>Returns:</B><DD>GROUP or RUN for valid sets, INVALID otherwise</DL>
+<A NAME="isValidGroup(int, jrummikub.model.GameSettings)"><!-- --></A><H3>
+isValidGroup</H3>
+<PRE>
+private int <B>isValidGroup</B>(int&nbsp;value,
+ <A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD>Test for rule conflict within the StoneSet, assuming we have a group
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>value</CODE> - the value of the stones (all have the same in a group)<DD><CODE>settings</CODE> - the game settings
+<DT><B>Returns:</B><DD>the set's points</DL>
</DD>
</DL>
<HR>
@@ -421,10 +540,10 @@ public <A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.m
</DL>
<HR>
-<A NAME="size()"><!-- --></A><H3>
-size</H3>
+<A NAME="getSize()"><!-- --></A><H3>
+getSize</H3>
<PRE>
-public int <B>size</B>()</PRE>
+public int <B>getSize</B>()</PRE>
<DL>
<DD>Returns the number of stones in the set.
<P>
diff --git a/doc/jrummikub/model/StoneTray.Direction.html b/doc/jrummikub/model/StoneTray.Direction.html
index c5fe015..6fc3fad 100644
--- a/doc/jrummikub/model/StoneTray.Direction.html
+++ b/doc/jrummikub/model/StoneTray.Direction.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
StoneTray.Direction
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/StoneTray.html b/doc/jrummikub/model/StoneTray.html
index 60468cb..f5e457c 100644
--- a/doc/jrummikub/model/StoneTray.html
+++ b/doc/jrummikub/model/StoneTray.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
StoneTray
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -98,7 +98,7 @@ java.lang.Object
<DL>
<DT><DT><B>Type Parameters:</B><DD><CODE>E</CODE> - Type of positioned objects (must implement Sizeable)</DL>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;E,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;E&gt;</DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;E,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;E&gt;</DD>
</DL>
<DL>
<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model">Hand</A>, <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model">Table</A></DD>
@@ -114,6 +114,8 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.StoneTray">Serialized Form</A></DL>
<HR>
<P>
@@ -150,6 +152,14 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -186,6 +196,14 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#contains(E)">contains</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Search for an object within the stone tray</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position)">drop</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position)</CODE>
@@ -195,6 +213,27 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">drop</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Subroutine to "drop" to consider and determine the direction the objects
+ dropped one collides with position-wise evade in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#dropUnchecked(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">dropUnchecked</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Subroutine to "drop" to execute the actual drop</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>protected &nbsp;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>,<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#fixInvalidDrop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">fixInvalidDrop</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos,
@@ -206,6 +245,38 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#getMoveDirection(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveDirection</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the direction to move the object in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#getMoveOrientation(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveOrientation</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Will the object be moved horizontally or vertically</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#getNewPosition(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction, E, jrummikub.model.Position)">getNewPosition</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;newDirection,
+ <A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;currentObject,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;currentPosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#getPosition(E)">getPosition</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object)</CODE>
@@ -230,6 +301,27 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#lessOrEqual(double, double)">lessOrEqual</A></B>(double&nbsp;d,
+ double&nbsp;e)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Static method for determining a less or equal relation considering a
+ small fuzziness</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#objectsOverlap(E, jrummikub.model.Position, E, jrummikub.model.Position)">objectsOverlap</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object1,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position1,
+ <A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object2,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tests whether two objects overlap</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;boolean</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/StoneTray.html#pickUp(E)">pickUp</A></B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object)</CODE>
@@ -259,6 +351,16 @@ A StoneTray is a collection of positioned objects (for example <A HREF="../../jr
</TR>
</TABLE>
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.StoneTray.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
<A NAME="objects"><!-- --></A><H3>
objects</H3>
<PRE>
@@ -313,6 +415,61 @@ public void <B>drop</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="ty
</DL>
<HR>
+<A NAME="drop(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.model.StoneTray.Direction)"><!-- --></A><A NAME="drop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)"><!-- --></A><H3>
+drop</H3>
+<PRE>
+private void <B>drop</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</PRE>
+<DL>
+<DD>Subroutine to "drop" to consider and determine the direction the objects
+ dropped one collides with position-wise evade in
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object</CODE> - the object to add to Hand<DD><CODE>position</CODE> - <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><CODE>Position</CODE></A> to put the object<DD><CODE>direction</CODE> - the direction the other stones evade in</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="dropUnchecked(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.model.StoneTray.Direction)"><!-- --></A><A NAME="dropUnchecked(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)"><!-- --></A><H3>
+dropUnchecked</H3>
+<PRE>
+private void <B>dropUnchecked</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</PRE>
+<DL>
+<DD>Subroutine to "drop" to execute the actual drop
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object</CODE> - the object to add to Hand<DD><CODE>position</CODE> - <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><CODE>Position</CODE></A> to put the object<DD><CODE>direction</CODE> - the direction the other stones evade in</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getNewPosition(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.model.StoneTray.Direction,jrummikub.model.Sizeable,jrummikub.model.Position)"><!-- --></A><A NAME="getNewPosition(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction, E, jrummikub.model.Position)"><!-- --></A><H3>
+getNewPosition</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A> <B>getNewPosition</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;newDirection,
+ <A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;currentObject,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;currentPosition)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="fixInvalidDrop(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.model.StoneTray.Direction)"><!-- --></A><A NAME="fixInvalidDrop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)"><!-- --></A><H3>
fixInvalidDrop</H3>
<PRE>
@@ -333,6 +490,83 @@ protected <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.uti
</DL>
<HR>
+<A NAME="lessOrEqual(double, double)"><!-- --></A><H3>
+lessOrEqual</H3>
+<PRE>
+private static boolean <B>lessOrEqual</B>(double&nbsp;d,
+ double&nbsp;e)</PRE>
+<DL>
+<DD>Static method for determining a less or equal relation considering a
+ small fuzziness
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>d</CODE> - the value to be less or equal<DD><CODE>e</CODE> - than the other one
+<DT><B>Returns:</B><DD>if d is less or equal e</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="objectsOverlap(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.model.Sizeable,jrummikub.model.Position)"><!-- --></A><A NAME="objectsOverlap(E, jrummikub.model.Position, E, jrummikub.model.Position)"><!-- --></A><H3>
+objectsOverlap</H3>
+<PRE>
+private boolean <B>objectsOverlap</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object1,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position1,
+ <A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object2,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position2)</PRE>
+<DL>
+<DD>Tests whether two objects overlap
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object1</CODE> - first object<DD><CODE>position1</CODE> - first object's position<DD><CODE>object2</CODE> - second object<DD><CODE>position2</CODE> - second object's position
+<DT><B>Returns:</B><DD>whether they overlap</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getMoveDirection(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.util.Pair)"><!-- --></A><A NAME="getMoveDirection(E, jrummikub.model.Position, jrummikub.util.Pair)"><!-- --></A><H3>
+getMoveDirection</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A> <B>getMoveDirection</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</PRE>
+<DL>
+<DD>Returns the direction to move the object in
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object</CODE> - the object<DD><CODE>position</CODE> - the object's position<DD><CODE>blocking</CODE> - the object thats blocking
+<DT><B>Returns:</B><DD>the direction</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getMoveOrientation(jrummikub.model.Sizeable,jrummikub.model.Position,jrummikub.util.Pair)"><!-- --></A><A NAME="getMoveOrientation(E, jrummikub.model.Position, jrummikub.util.Pair)"><!-- --></A><H3>
+getMoveOrientation</H3>
+<PRE>
+private boolean <B>getMoveOrientation</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</PRE>
+<DL>
+<DD>Will the object be moved horizontally or vertically
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object</CODE> - the object<DD><CODE>position</CODE> - the objects position<DD><CODE>blocking</CODE> - the object thats blocking
+<DT><B>Returns:</B><DD>boolean vertical movement</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getPosition(jrummikub.model.Sizeable)"><!-- --></A><A NAME="getPosition(E)"><!-- --></A><H3>
getPosition</H3>
<PRE>
@@ -351,6 +585,24 @@ public <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.m
</DL>
<HR>
+<A NAME="contains(jrummikub.model.Sizeable)"><!-- --></A><A NAME="contains(E)"><!-- --></A><H3>
+contains</H3>
+<PRE>
+public boolean <B>contains</B>(<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object)</PRE>
+<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">IStoneTray</A></CODE></B></DD>
+<DD>Search for an object within the stone tray
+<P>
+<DD><DL>
+<DT><B>Specified by:</B><DD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">contains</A></CODE> in interface <CODE><A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A> extends <A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>&gt;</CODE></DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>object</CODE> - object to search for
+<DT><B>Returns:</B><DD>object found in stone tray</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="iterator()"><!-- --></A><H3>
iterator</H3>
<PRE>
diff --git a/doc/jrummikub/model/Table.html b/doc/jrummikub/model/Table.html
index 989a94d..009c7a4 100644
--- a/doc/jrummikub/model/Table.html
+++ b/doc/jrummikub/model/Table.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:58 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:55 CEST 2011 -->
<TITLE>
Table
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -56,7 +56,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Table.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Table.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -76,9 +76,9 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_jrummikub.model.StoneTray">NESTED</A>&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_jrummikub.model.StoneTray">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -97,7 +97,7 @@ java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.model.Table</B>
</PRE>
<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;, <A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></DD>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Cloneable, java.lang.Iterable&lt;<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;, <A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;, <A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></DD>
</DL>
<HR>
<DL>
@@ -109,6 +109,8 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<P>
<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../serialized-form.html#jrummikub.model.Table">Serialized Form</A></DL>
<HR>
<P>
@@ -120,6 +122,14 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
<B>Nested Class Summary</B></FONT></TH>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model">Table.StoneInfo</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="nested_classes_inherited_from_class_jrummikub.model.StoneTray"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -139,6 +149,22 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
<B>Field Summary</B></FONT></TH>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#gameSettings">gameSettings</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;long</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#serialVersionUID">serialVersionUID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="fields_inherited_from_class_jrummikub.model.StoneTray"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -159,10 +185,10 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#Table()">Table</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#Table(jrummikub.model.GameSettings)">Table</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for a table</TD>
</TR>
</TABLE>
&nbsp;
@@ -176,6 +202,14 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model">Table.StoneInfo</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#findStoneInfo(jrummikub.model.Stone)">findStoneInfo</A></B>(<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Finds <A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model"><CODE>Table.StoneInfo</CODE></A></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#findStoneSet(jrummikub.model.Stone)">findStoneSet</A></B>(<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone)</CODE>
@@ -198,6 +232,16 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Removes <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A> from the Table</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/model/Table.html#splitSet(jrummikub.model.StoneSet, jrummikub.model.Position, int)">splitSet</A></B>(<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;setPosition,
+ int&nbsp;stonePosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Splits a stone set at a specified position</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_jrummikub.model.StoneTray"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -205,7 +249,7 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<TH ALIGN="left"><B>Methods inherited from class jrummikub.model.<A HREF="../../jrummikub/model/StoneTray.html" title="class in jrummikub.model">StoneTray</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../jrummikub/model/StoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/StoneTray.html#fixInvalidDrop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">fixInvalidDrop</A>, <A HREF="../../jrummikub/model/StoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/StoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/StoneTray.html#iterator()">iterator</A>, <A HREF="../../jrummikub/model/StoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
+<TD><CODE><A HREF="../../jrummikub/model/StoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/StoneTray.html#contains(E)">contains</A>, <A HREF="../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/StoneTray.html#fixInvalidDrop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">fixInvalidDrop</A>, <A HREF="../../jrummikub/model/StoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/StoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/StoneTray.html#iterator()">iterator</A>, <A HREF="../../jrummikub/model/StoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -223,7 +267,7 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
<TH ALIGN="left"><B>Methods inherited from interface jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
+<TD><CODE><A HREF="../../jrummikub/model/IStoneTray.html#clone()">clone</A>, <A HREF="../../jrummikub/model/IStoneTray.html#contains(E)">contains</A>, <A HREF="../../jrummikub/model/IStoneTray.html#drop(E, jrummikub.model.Position)">drop</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getPosition(E)">getPosition</A>, <A HREF="../../jrummikub/model/IStoneTray.html#getSize()">getSize</A>, <A HREF="../../jrummikub/model/IStoneTray.html#pickUp(E)">pickUp</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Iterable"><!-- --></A>
@@ -238,6 +282,35 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
&nbsp;
<P>
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="serialVersionUID"><!-- --></A><H3>
+serialVersionUID</H3>
+<PRE>
+private static final long <B>serialVersionUID</B></PRE>
+<DL>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../constant-values.html#jrummikub.model.Table.serialVersionUID">Constant Field Values</A></DL>
+</DL>
+<HR>
+
+<A NAME="gameSettings"><!-- --></A><H3>
+gameSettings</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A> <B>gameSettings</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -248,11 +321,15 @@ Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class
</TR>
</TABLE>
-<A NAME="Table()"><!-- --></A><H3>
+<A NAME="Table(jrummikub.model.GameSettings)"><!-- --></A><H3>
Table</H3>
<PRE>
-public <B>Table</B>()</PRE>
+public <B>Table</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</PRE>
+<DL>
+<DD>Constructor for a table
+<P>
<DL>
+<DT><B>Parameters:</B><DD><CODE>settings</CODE> - GameSettings</DL>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -281,6 +358,23 @@ public void <B>pickUpStone</B>(<A HREF="../../jrummikub/model/Stone.html" title=
</DL>
<HR>
+<A NAME="findStoneInfo(jrummikub.model.Stone)"><!-- --></A><H3>
+findStoneInfo</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model">Table.StoneInfo</A> <B>findStoneInfo</B>(<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone)</PRE>
+<DL>
+<DD>Finds <A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model"><CODE>Table.StoneInfo</CODE></A>
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>stone</CODE> - the stone
+<DT><B>Returns:</B><DD>the info</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="findStoneSet(jrummikub.model.Stone)"><!-- --></A><H3>
findStoneSet</H3>
<PRE>
@@ -299,6 +393,24 @@ public <A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.m
</DL>
<HR>
+<A NAME="splitSet(jrummikub.model.StoneSet, jrummikub.model.Position, int)"><!-- --></A><H3>
+splitSet</H3>
+<PRE>
+private void <B>splitSet</B>(<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ <A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;setPosition,
+ int&nbsp;stonePosition)</PRE>
+<DL>
+<DD>Splits a stone set at a specified position
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>set</CODE> - the stone set to split<DD><CODE>setPosition</CODE> - the set's position on the table<DD><CODE>stonePosition</CODE> - the stone after which splitting should occur</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="isValid()"><!-- --></A><H3>
isValid</H3>
<PRE>
@@ -346,7 +458,7 @@ public boolean <B>isValid</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/Table.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="Table.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -366,9 +478,9 @@ public boolean <B>isValid</B>()</PRE>
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_jrummikub.model.StoneTray">NESTED</A>&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_jrummikub.model.StoneTray">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
diff --git a/doc/jrummikub/model/class-use/GameState.html b/doc/jrummikub/model/class-use/GameState.html
index 166ec0a..d30de82 100644
--- a/doc/jrummikub/model/class-use/GameState.html
+++ b/doc/jrummikub/model/class-use/GameState.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.GameState
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -83,7 +83,176 @@ function windowTitle()
<H2>
<B>Uses of Class<br>jrummikub.model.GameState</B></H2>
</CENTER>
-No usage of jrummikub.model.GameState
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Packages that use <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control"><B>jrummikub.control</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A> in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> declared as <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></CODE></FONT></TD>
+<TD><CODE><B>GameControl.</B><B><A HREF="../../../jrummikub/control/GameControl.html#gameState">gameState</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></CODE></FONT></TD>
+<TD><CODE><B>SaveControl.</B><B><A HREF="../../../jrummikub/control/SaveControl.html#gameState">gameState</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with type parameters of type <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event3.html" title="class in jrummikub.util">Event3</A>&lt;<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>,<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A>,<A HREF="../../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>SaveControl.</B><B><A HREF="../../../jrummikub/control/SaveControl.html#loadEvent">loadEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> that return types with arguments of type <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent3.html" title="interface in jrummikub.util">IEvent3</A>&lt;<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>,<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A>,<A HREF="../../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>SaveControl.</B><B><A HREF="../../../jrummikub/control/SaveControl.html#getLoadEvent()">getLoadEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Getter for loadEvent</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with parameters of type <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>GameControl.</B><B><A HREF="../../../jrummikub/control/GameControl.html#continueGame(jrummikub.model.GameState, jrummikub.model.IRoundState)">continueGame</A></B>(<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A>&nbsp;gameState,
+ <A HREF="../../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Continues game after loading</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>SaveControl.</B><B><A HREF="../../../jrummikub/control/SaveControl.html#setGameState(jrummikub.model.GameState)">setGameState</A></B>(<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A>&nbsp;gameState)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the current game state</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.model"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A> in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#gameState">gameState</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></CODE></FONT></TD>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getGameState()">getGameState</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the game state</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getGameState()">getGameState</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with parameters of type <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/model/RoundState.html#RoundState(jrummikub.model.GameSettings, jrummikub.model.GameState)">RoundState</A></B>(<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;gameSettings,
+ <A HREF="../../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A>&nbsp;gameState)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new RoundState with an empty table</TD>
+</TR>
+</TABLE>
+&nbsp;
<P>
<HR>
diff --git a/doc/jrummikub/model/class-use/Hand.html b/doc/jrummikub/model/class-use/Hand.html
index a0a5082..4a8afb4 100644
--- a/doc/jrummikub/model/class-use/Hand.html
+++ b/doc/jrummikub/model/class-use/Hand.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.Hand
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/class-use/IHand.html b/doc/jrummikub/model/class-use/IHand.html
index 70e4ca9..66060e7 100644
--- a/doc/jrummikub/model/class-use/IHand.html
+++ b/doc/jrummikub/model/class-use/IHand.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Interface jrummikub.model.IHand
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -90,7 +90,7 @@ function windowTitle()
Packages that use <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#jrummikub.control"><B>jrummikub.control</B></A></TD>
+<TD><A HREF="#jrummikub.control.turn"><B>jrummikub.control.turn</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -100,11 +100,11 @@ Packages that use <A HREF="../../../jrummikub/model/IHand.html" title="interface
</TABLE>
&nbsp;
<P>
-<A NAME="jrummikub.control"><!-- --></A>
+<A NAME="jrummikub.control.turn"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A> in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A></FONT></TH>
+Uses of <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A> in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A></FONT></TH>
</TR>
</TABLE>
&nbsp;
@@ -112,25 +112,47 @@ Uses of <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummi
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with parameters of type <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> declared as <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../jrummikub/control/TurnControl.html#TurnControl(jrummikub.model.IHand, jrummikub.model.ITable, jrummikub.view.IView)">TurnControl</A></B>(<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand,
- <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table,
- <A HREF="../../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#hand">hand</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#oldHand">oldHand</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> that return <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#getHand()">getHand</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new TurnControl using a given hand (of the active player), a given
- table and a given view for user interaction.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the current player's hand</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../jrummikub/control/TurnControl.html#TurnControl(jrummikub.model.IHand, jrummikub.model.ITable, jrummikub.view.IView, jrummikub.control.ITurnTimer)">TurnControl</A></B>(<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand,
- <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table,
- <A HREF="../../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
- <A HREF="../../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A>&nbsp;testTimer)</CODE>
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#getOldHand()">getOldHand</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test only constructor</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the current player's hand at the beginning of the turn</TD>
</TR>
</TABLE>
&nbsp;
@@ -163,16 +185,24 @@ Uses of <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummi
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
-<TD><CODE><B>Player.</B><B><A HREF="../../../jrummikub/model/Player.html#getHand()">getHand</A></B>()</CODE>
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B>Player.</B><B><A HREF="../../../jrummikub/model/Player.html#hand">hand</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
@@ -181,6 +211,38 @@ Uses of <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummi
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current hand of the player</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></CODE></FONT></TD>
+<TD><CODE><B>Player.</B><B><A HREF="../../../jrummikub/model/Player.html#getHand()">getHand</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with parameters of type <A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>IPlayer.</B><B><A HREF="../../../jrummikub/model/IPlayer.html#setHand(jrummikub.model.IHand)">setHand</A></B>(<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set the current hand of the player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Player.</B><B><A HREF="../../../jrummikub/model/Player.html#setHand(jrummikub.model.IHand)">setHand</A></B>(<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/doc/jrummikub/model/class-use/IPlayer.html b/doc/jrummikub/model/class-use/IPlayer.html
index 9c4cd54..98672ce 100644
--- a/doc/jrummikub/model/class-use/IPlayer.html
+++ b/doc/jrummikub/model/class-use/IPlayer.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:06 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Interface jrummikub.model.IPlayer
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -93,6 +93,14 @@ Packages that use <A HREF="../../../jrummikub/model/IPlayer.html" title="interfa
<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.view"><B>jrummikub.view</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.view.impl"><B>jrummikub.view.impl</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -124,12 +132,36 @@ Uses of <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrum
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#lastPlayer">lastPlayer</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
-<TD><CODE><B>GameState.</B><B><A HREF="../../../jrummikub/model/GameState.html#getActivePlayer()">getActivePlayer</A></B>()</CODE>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getActivePlayer()">getActivePlayer</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the currently active player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getActivePlayer()">getActivePlayer</A></B>()</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -137,15 +169,16 @@ Uses of <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrum
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
-<TD><CODE><B>IGameState.</B><B><A HREF="../../../jrummikub/model/IGameState.html#getActivePlayer()">getActivePlayer</A></B>()</CODE>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getLastPlayer()">getLastPlayer</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the currently active player</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the player that will make the last turn before the round ends when the
+ heap is empty</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
-<TD><CODE><B>GameState.</B><B><A HREF="../../../jrummikub/model/GameState.html#getNthNextPlayer(int)">getNthNextPlayer</A></B>(int&nbsp;i)</CODE>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getLastPlayer()">getLastPlayer</A></B>()</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -153,11 +186,156 @@ Uses of <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrum
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
-<TD><CODE><B>IGameState.</B><B><A HREF="../../../jrummikub/model/IGameState.html#getNthNextPlayer(int)">getNthNextPlayer</A></B>(int&nbsp;i)</CODE>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getNthNextPlayer(int)">getNthNextPlayer</A></B>(int&nbsp;i)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the player that would be the active player after i turns</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getNthNextPlayer(int)">getNthNextPlayer</A></B>(int&nbsp;i)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getNthPlayer(int)">getNthPlayer</A></B>(int&nbsp;i)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the nth player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getNthPlayer(int)">getNthPlayer</A></B>(int&nbsp;i)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with parameters of type <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#setLastPlayer(jrummikub.model.IPlayer)">setLastPlayer</A></B>(<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&nbsp;lastPlayer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the player that will make the last turn before the round ends when the
+ heap is empty</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#setLastPlayer(jrummikub.model.IPlayer)">setLastPlayer</A></B>(<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&nbsp;lastPlayer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.view"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A> in <A HREF="../../../jrummikub/view/package-summary.html">jrummikub.view</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/view/package-summary.html">jrummikub.view</A> with type arguments of type <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>ISidePanel.</B><B><A HREF="../../../jrummikub/view/ISidePanel.html#setPlayers(java.util.List)">setPlayers</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&gt;&nbsp;players)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the player information in order of turns</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.view.impl"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A> in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with parameters of type <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>SidePanel.PlayerListItem.</B><B><A HREF="../../../jrummikub/view/impl/SidePanel.PlayerListItem.html#addHandSizeInfo(jrummikub.model.IPlayer)">addHandSizeInfo</A></B>(<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&nbsp;player)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>SidePanel.PlayerListItem.</B><B><A HREF="../../../jrummikub/view/impl/SidePanel.PlayerListItem.html#addLastTurnInfo(jrummikub.model.IPlayer)">addLastTurnInfo</A></B>(<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&nbsp;player)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with type arguments of type <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>SidePanel.</B><B><A HREF="../../../jrummikub/view/impl/SidePanel.html#setPlayers(java.util.List)">setPlayers</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&gt;&nbsp;players)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>SidePanel.PlayerListPanel.</B><B><A HREF="../../../jrummikub/view/impl/SidePanel.PlayerListPanel.html#setPlayers(java.util.List)">setPlayers</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&gt;&nbsp;players)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with parameters of type <A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/view/impl/SidePanel.PlayerListItem.html#SidePanel.PlayerListItem(jrummikub.model.IPlayer)">SidePanel.PlayerListItem</A></B>(<A HREF="../../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>&nbsp;player)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/doc/jrummikub/model/class-use/IStoneTray.html b/doc/jrummikub/model/class-use/IStoneTray.html
index dc1e289..55c0d83 100644
--- a/doc/jrummikub/model/class-use/IStoneTray.html
+++ b/doc/jrummikub/model/class-use/IStoneTray.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Interface jrummikub.model.IStoneTray
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/class-use/ITable.html b/doc/jrummikub/model/class-use/ITable.html
index f3a4745..fb3ec20 100644
--- a/doc/jrummikub/model/class-use/ITable.html
+++ b/doc/jrummikub/model/class-use/ITable.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Interface jrummikub.model.ITable
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -94,6 +94,14 @@ Packages that use <A HREF="../../../jrummikub/model/ITable.html" title="interfac
<TD>&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control.network"><B>jrummikub.control.network</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control.turn"><B>jrummikub.control.turn</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
@@ -112,13 +120,12 @@ Uses of <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrumm
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with parameters of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> declared as <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>(package private) static&nbsp;java.util.Set&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B>RoundControl.</B><B><A HREF="../../../jrummikub/control/RoundControl.html#tableDifference(jrummikub.model.ITable, jrummikub.model.ITable)">tableDifference</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;oldTable,
- <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;newTable)</CODE>
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>RoundControl.InvalidTurnInfo.</B><B><A HREF="../../../jrummikub/control/RoundControl.InvalidTurnInfo.html#table">table</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -129,25 +136,227 @@ Uses of <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrumm
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> that return <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>RoundControl.InvalidTurnInfo.</B><B><A HREF="../../../jrummikub/control/RoundControl.InvalidTurnInfo.html#getTable()">getTable</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Getter for table</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with parameters of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../jrummikub/control/TurnControl.html#TurnControl(jrummikub.model.IHand, jrummikub.model.ITable, jrummikub.view.IView)">TurnControl</A></B>(<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand,
- <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table,
- <A HREF="../../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
+<TD><CODE><B><A HREF="../../../jrummikub/control/RoundControl.InvalidTurnInfo.html#RoundControl.InvalidTurnInfo(jrummikub.model.ITable, jrummikub.control.RoundControl.InvalidTurnType, java.util.Collection)">RoundControl.InvalidTurnInfo</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table,
+ <A HREF="../../../jrummikub/control/RoundControl.InvalidTurnType.html" title="enum in jrummikub.control">RoundControl.InvalidTurnType</A>&nbsp;type,
+ java.util.Collection&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;&nbsp;invalidSets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates new InvalidTurnInfo</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control.network"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A> in <A HREF="../../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A> with type parameters of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>ConnectionControl.</B><B><A HREF="../../../jrummikub/control/network/ConnectionControl.html#tableUpdateEvent">tableUpdateEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A> that return types with arguments of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>ConnectionControl.</B><B><A HREF="../../../jrummikub/control/network/ConnectionControl.html#getTableUpdateEvent()">getTableUpdateEvent</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new TurnControl using a given hand (of the active player), a given
- table and a given view for user interaction.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../jrummikub/control/TurnControl.html#TurnControl(jrummikub.model.IHand, jrummikub.model.ITable, jrummikub.view.IView, jrummikub.control.ITurnTimer)">TurnControl</A></B>(<A HREF="../../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>&nbsp;hand,
- <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table,
- <A HREF="../../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
- <A HREF="../../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A>&nbsp;testTimer)</CODE>
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>IConnectionControl.</B><B><A HREF="../../../jrummikub/control/network/IConnectionControl.html#getTableUpdateEvent()">getTableUpdateEvent</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test only constructor</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A> with parameters of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>ConnectionControl.</B><B><A HREF="../../../jrummikub/control/network/ConnectionControl.html#updateTable(jrummikub.model.ITable)">updateTable</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>IConnectionControl.</B><B><A HREF="../../../jrummikub/control/network/IConnectionControl.html#updateTable(jrummikub.model.ITable)">updateTable</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control.turn"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A> in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> declared as <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#oldTable">oldTable</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#table">table</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with type parameters of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#tableUpdateEvent">tableUpdateEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> that return <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#getOldTable()">getOldTable</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the table at the beginning of the turn</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.TurnInfo.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.TurnInfo.html#getTable()">getTable</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the current table</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> that return types with arguments of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#getTableUpdateEvent()">getTableUpdateEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>ITurnControl.</B><B><A HREF="../../../jrummikub/control/turn/ITurnControl.html#getTableUpdateEvent()">getTableUpdateEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Emitted in network when the table changes during player turn</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with parameters of type <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) static&nbsp;java.util.Set&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#tableDifference(jrummikub.model.ITable, jrummikub.model.ITable)">tableDifference</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;oldTable,
+ <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;newTable)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) static&nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#tableSetDifference(jrummikub.model.ITable, jrummikub.model.ITable)">tableSetDifference</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;oldTable,
+ <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;newTable)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
@@ -180,24 +389,40 @@ Uses of <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrumm
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
-<TD><CODE><B>GameState.</B><B><A HREF="../../../jrummikub/model/GameState.html#getTable()">getTable</A></B>()</CODE>
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#table">table</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
-<TD><CODE><B>IGameState.</B><B><A HREF="../../../jrummikub/model/IGameState.html#getTable()">getTable</A></B>()</CODE>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getTable()">getTable</A></B>()</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the current <A HREF="../../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A></TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getTable()">getTable</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -209,18 +434,18 @@ Uses of <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrumm
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>GameState.</B><B><A HREF="../../../jrummikub/model/GameState.html#setTable(jrummikub.model.ITable)">setTable</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#setTable(jrummikub.model.ITable)">setTable</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the current <A HREF="../../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>IGameState.</B><B><A HREF="../../../jrummikub/model/IGameState.html#setTable(jrummikub.model.ITable)">setTable</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#setTable(jrummikub.model.ITable)">setTable</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the current <A HREF="../../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A></TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/doc/jrummikub/model/class-use/Player.html b/doc/jrummikub/model/class-use/Player.html
index 247668f..fdff2f3 100644
--- a/doc/jrummikub/model/class-use/Player.html
+++ b/doc/jrummikub/model/class-use/Player.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.Player
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -83,7 +83,43 @@ function windowTitle()
<H2>
<B>Uses of Class<br>jrummikub.model.Player</B></H2>
</CENTER>
-No usage of jrummikub.model.Player
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Packages that use <A HREF="../../../jrummikub/model/Player.html" title="class in jrummikub.model">Player</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.model"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/Player.html" title="class in jrummikub.model">Player</A> in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with type parameters of type <A HREF="../../../jrummikub/model/Player.html" title="class in jrummikub.model">Player</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.ArrayList&lt;<A HREF="../../../jrummikub/model/Player.html" title="class in jrummikub.model">Player</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#players">players</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
<P>
<HR>
diff --git a/doc/jrummikub/model/class-use/Position.html b/doc/jrummikub/model/class-use/Position.html
index 23071cd..648df09 100644
--- a/doc/jrummikub/model/class-use/Position.html
+++ b/doc/jrummikub/model/class-use/Position.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.Position
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -90,7 +90,7 @@ function windowTitle()
Packages that use <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#jrummikub.control"><B>jrummikub.control</B></A></TD>
+<TD><A HREF="#jrummikub.control.turn"><B>jrummikub.control.turn</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -108,11 +108,11 @@ Packages that use <A HREF="../../../jrummikub/model/Position.html" title="class
</TABLE>
&nbsp;
<P>
-<A NAME="jrummikub.control"><!-- --></A>
+<A NAME="jrummikub.control.turn"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A> in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A></FONT></TH>
+Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A> in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A></FONT></TH>
</TR>
</TABLE>
&nbsp;
@@ -120,12 +120,36 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with type arguments of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with parameters of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#handClick(jrummikub.model.Position)">handClick</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#tableClick(jrummikub.model.Position)">tableClick</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with type arguments of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>TurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/TurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
+<TD><CODE><B>HumanTurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair2)</CODE>
<BR>
@@ -134,7 +158,7 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>TurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/TurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
+<TD><CODE><B>HumanTurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair2)</CODE>
<BR>
@@ -155,6 +179,22 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
+<TD><CODE><B>Table.StoneInfo.</B><B><A HREF="../../../jrummikub/model/Table.StoneInfo.html#setPosition">setPosition</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with type parameters of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -175,6 +215,18 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getNewPosition(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction, E, jrummikub.model.Position)">getNewPosition</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;newDirection,
+ <A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;currentObject,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;currentPosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getPosition(E)">getPosition</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object)</CODE>
@@ -254,6 +306,27 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">drop</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Subroutine to "drop" to consider and determine the direction the objects
+ dropped one collides with position-wise evade in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#dropUnchecked(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">dropUnchecked</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Subroutine to "drop" to execute the actual drop</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>protected &nbsp;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>,<A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&gt;</CODE></FONT></TD>
<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#fixInvalidDrop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">fixInvalidDrop</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos,
@@ -273,6 +346,103 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A></CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getMoveDirection(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveDirection</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the direction to move the object in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getMoveOrientation(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveOrientation</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Will the object be moved horizontally or vertically</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getNewPosition(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction, E, jrummikub.model.Position)">getNewPosition</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;newDirection,
+ <A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;currentObject,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;currentPosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#objectsOverlap(E, jrummikub.model.Position, E, jrummikub.model.Position)">objectsOverlap</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object1,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position1,
+ <A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object2,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tests whether two objects overlap</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Table.</B><B><A HREF="../../../jrummikub/model/Table.html#splitSet(jrummikub.model.StoneSet, jrummikub.model.Position, int)">splitSet</A></B>(<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;setPosition,
+ int&nbsp;stonePosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Splits a stone set at a specified position</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with type arguments of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A></CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getMoveDirection(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveDirection</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the direction to move the object in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getMoveOrientation(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveOrientation</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Will the object be moved horizontally or vertically</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with parameters of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/model/Table.StoneInfo.html#Table.StoneInfo(jrummikub.model.StoneSet, jrummikub.model.Position, int)">Table.StoneInfo</A></B>(<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;setPosition,
+ int&nbsp;stonePosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -337,11 +507,51 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with type parameters of type <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#clickEvent">clickEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#pauseStoneSets">pauseStoneSets</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#stones">stones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#stoneSets">stoneSets</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> that return <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
+<CODE>(package private) &nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#calculatePosition(int, int)">calculatePosition</A></B>(int&nbsp;x,
int&nbsp;y)</CODE>
@@ -358,6 +568,14 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>View.</B><B><A HREF="../../../jrummikub/view/impl/View.html#createDecorationStones()">createDecorationStones</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;</CODE></FONT></TD>
<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#getClickEvent()">getClickEvent</A></B>()</CODE>
@@ -382,11 +600,11 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#handleOtherClickEvent(jrummikub.model.Position)">handleOtherClickEvent</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#getStoneAt(jrummikub.model.Position)">getStoneAt</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Overwrite this method to signal if special zone was clicked</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the stone at the specified position</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -406,11 +624,11 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#handleOtherMoveEvent(jrummikub.model.Position)">handleOtherMoveEvent</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
+<CODE>protected &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#handleOtherClickEvent(jrummikub.model.Position)">handleOtherClickEvent</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Overwrite this method to signal if special zone was hovered</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Overwrite this method to signal if special zone was clicked</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -422,16 +640,36 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#paintStone(java.awt.Graphics2D, jrummikub.model.Stone, jrummikub.model.Position, boolean, boolean)">paintStone</A></B>(java.awt.Graphics2D&nbsp;g,
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#handleOtherMoveEvent(jrummikub.model.Position)">handleOtherMoveEvent</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Overwrite this method to signal if special zone was hovered</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#paintStone(java.awt.Graphics2D, jrummikub.model.Stone, jrummikub.model.Position, jrummikub.view.impl.StonePainter.StoneState, boolean)">paintStone</A></B>(java.awt.Graphics2D&nbsp;g,
<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;p,
- boolean&nbsp;selected,
+ <A HREF="../../../jrummikub/view/impl/StonePainter.StoneState.html" title="enum in jrummikub.view.impl">StonePainter.StoneState</A>&nbsp;state,
boolean&nbsp;hovered)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Paints a stone</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#paintStoneSet(java.awt.Graphics2D, jrummikub.model.StoneSet, jrummikub.model.Position, java.awt.geom.Area, java.awt.geom.Area)">paintStoneSet</A></B>(java.awt.Graphics2D&nbsp;g,
+ <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;stoneSet,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos,
+ java.awt.geom.Area&nbsp;connectorArea,
+ java.awt.geom.Area&nbsp;hoveredConnectorArea)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -442,19 +680,19 @@ Uses of <A HREF="../../../jrummikub/model/Position.html" title="class in jrummik
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#setStones(java.lang.Iterable)">setStones</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stones)</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HandPanel.</B><B><A HREF="../../../jrummikub/view/impl/HandPanel.html#setStones(java.lang.Iterable)">setStones</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stones)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the list of stones that can be clicked on</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>HandPanel.</B><B><A HREF="../../../jrummikub/view/impl/HandPanel.html#setStones(java.lang.Iterable)">setStones</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stones)</CODE>
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#setStones(java.lang.Iterable)">setStones</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stones)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the list of stones that can be clicked on</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
diff --git a/doc/jrummikub/model/class-use/Sizeable.html b/doc/jrummikub/model/class-use/Sizeable.html
index f3092e7..742048b 100644
--- a/doc/jrummikub/model/class-use/Sizeable.html
+++ b/doc/jrummikub/model/class-use/Sizeable.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Interface jrummikub.model.Sizeable
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/class-use/Stone.html b/doc/jrummikub/model/class-use/Stone.html
index 0e84e0a..100ed98 100644
--- a/doc/jrummikub/model/class-use/Stone.html
+++ b/doc/jrummikub/model/class-use/Stone.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.Stone
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -90,7 +90,11 @@ function windowTitle()
Packages that use <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#jrummikub.control"><B>jrummikub.control</B></A></TD>
+<TD><A HREF="#jrummikub.ai"><B>jrummikub.ai</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control.turn"><B>jrummikub.control.turn</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -108,11 +112,11 @@ Packages that use <A HREF="../../../jrummikub/model/Stone.html" title="class in
</TABLE>
&nbsp;
<P>
-<A NAME="jrummikub.control"><!-- --></A>
+<A NAME="jrummikub.ai"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A> in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A></FONT></TH>
+Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A> in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A></FONT></TH>
</TR>
</TABLE>
&nbsp;
@@ -120,12 +124,93 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> that return types with arguments of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A> with type parameters of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TurnLogic.</B><B><A HREF="../../../jrummikub/ai/TurnLogic.html#inputStones">inputStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A> with parameters of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/ai/TurnLogic.StoneState.html#TurnLogic.StoneState(int, jrummikub.model.Stone, boolean)">TurnLogic.StoneState</A></B>(int&nbsp;id,
+ <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;table)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructor parameters in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A> with type arguments of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/ai/TurnLogic.html#TurnLogic(jrummikub.model.GameSettings, java.util.Collection, java.util.Collection)">TurnLogic</A></B>(<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings,
+ java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;tableStones,
+ java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;handStones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates new turn logic</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/ai/TurnLogic.html#TurnLogic(jrummikub.model.GameSettings, java.util.Collection, java.util.Collection)">TurnLogic</A></B>(<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings,
+ java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;tableStones,
+ java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;handStones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates new turn logic</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control.turn"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A> in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with type parameters of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#selectedStones">selectedStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> that return types with arguments of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>(package private) static&nbsp;java.util.Set&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B>RoundControl.</B><B><A HREF="../../../jrummikub/control/RoundControl.html#tableDifference(jrummikub.model.ITable, jrummikub.model.ITable)">tableDifference</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;oldTable,
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#tableDifference(jrummikub.model.ITable, jrummikub.model.ITable)">tableDifference</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;oldTable,
<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;newTable)</CODE>
<BR>
@@ -137,12 +222,135 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with type arguments of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with parameters of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#collectionSetClick(jrummikub.model.Stone, boolean)">collectionSetClick</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;collect)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#collectionStoneClick(jrummikub.model.Stone, boolean)">collectionStoneClick</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;collect)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>TurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/TurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
+<TD><CODE><B>HumanTurnControl.RunComparator.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.RunComparator.html#compare(jrummikub.model.Stone, jrummikub.model.Stone)">compare</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s1,
+ <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.GroupComparator.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.GroupComparator.html#compare(jrummikub.model.Stone, jrummikub.model.Stone)">compare</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s1,
+ <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#compareColors(jrummikub.model.Stone, jrummikub.model.Stone)">compareColors</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s1,
+ <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#compareJokers(jrummikub.model.Stone, jrummikub.model.Stone)">compareJokers</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s1,
+ <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#compareValues(jrummikub.model.Stone, jrummikub.model.Stone)">compareValues</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s1,
+ <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;s2)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#handRangeClick(jrummikub.model.Stone, boolean)">handRangeClick</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;collect)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#stoneClick(jrummikub.model.Stone, boolean)">stoneClick</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;collect)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#tableRangeClick(jrummikub.model.Stone, boolean)">tableRangeClick</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;collect)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#tableSetClick(jrummikub.model.Stone, boolean)">tableSetClick</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
+ boolean&nbsp;collect)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with type arguments of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AIControl.</B><B><A HREF="../../../jrummikub/control/turn/AIControl.html#addHandStones(java.util.List)">addHandStones</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;handStones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AIControl.</B><B><A HREF="../../../jrummikub/control/turn/AIControl.html#addTableStones(java.util.List)">addTableStones</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;tableStones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair2)</CODE>
<BR>
@@ -151,12 +359,20 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>TurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/TurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
+<TD><CODE><B>HumanTurnControl.HandStonePositionComparator.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.HandStonePositionComparator.html#compare(jrummikub.util.Pair, jrummikub.util.Pair)">compare</A></B>(<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair1,
<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;pair2)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#sortStones(java.util.Comparator)">sortStones</A></B>(java.util.Comparator&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;comparator)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -176,12 +392,20 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>(package private) &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<CODE>(package private) &nbsp;java.util.ArrayList&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
<TD><CODE><B>StoneHeap.</B><B><A HREF="../../../jrummikub/model/StoneHeap.html#heap">heap</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.ArrayList&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>StoneSet.</B><B><A HREF="../../../jrummikub/model/StoneSet.html#stones">stones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -240,6 +464,14 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model">Table.StoneInfo</A></CODE></FONT></TD>
+<TD><CODE><B>Table.</B><B><A HREF="../../../jrummikub/model/Table.html#findStoneInfo(jrummikub.model.Stone)">findStoneInfo</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Finds <A HREF="../../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model"><CODE>Table.StoneInfo</CODE></A></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></CODE></FONT></TD>
<TD><CODE><B>Table.</B><B><A HREF="../../../jrummikub/model/Table.html#findStoneSet(jrummikub.model.Stone)">findStoneSet</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone)</CODE>
@@ -290,6 +522,14 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.util.TreeMap&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B>Hand.</B><B><A HREF="../../../jrummikub/model/Hand.html#countStones(java.util.List)">countStones</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Counts the numbers of stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B>StoneHeap.</B><B><A HREF="../../../jrummikub/model/StoneHeap.html#putBack(java.util.Collection)">putBack</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</CODE>
@@ -348,7 +588,7 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;the range click event is emitted when the player clicks on the table/hand/
- etc.</TD>
+ etc. and wants to select a range instead of a single stone</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -357,7 +597,7 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;the set click event is emitted when the player clicks on the table/hand/
- etc.</TD>
+ etc. and wants to select a whole set instead of a single stone</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -406,6 +646,86 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> declared as <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#hoveredStone">hoveredStone</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with type parameters of type <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event2.html" title="class in jrummikub.util">Event2</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,java.lang.Boolean&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#rangeClickEvent">rangeClickEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>StoneCollectionPanel.</B><B><A HREF="../../../jrummikub/view/impl/StoneCollectionPanel.html#selectedStones">selectedStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>HandPanel.</B><B><A HREF="../../../jrummikub/view/impl/HandPanel.html#selectedStones">selectedStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#selectedStones">selectedStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event2.html" title="class in jrummikub.util">Event2</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,java.lang.Boolean&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#setClickEvent">setClickEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event2.html" title="class in jrummikub.util">Event2</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,java.lang.Boolean&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#stoneClickEvent">stoneClickEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#stones">stones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> that return <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -416,6 +736,14 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the stone the mouse pointer is hovering over</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#getStoneAt(jrummikub.model.Position)">getStoneAt</A></B>(<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the stone at the specified position</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -426,6 +754,14 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>View.</B><B><A HREF="../../../jrummikub/view/impl/View.html#createDecorationStones()">createDecorationStones</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/util/Event2.html" title="class in jrummikub.util">Event2</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,java.lang.Boolean&gt;</CODE></FONT></TD>
<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#getRangeClickEvent()">getRangeClickEvent</A></B>()</CODE>
@@ -466,16 +802,24 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#paintStone(java.awt.Graphics2D, jrummikub.model.Stone, jrummikub.model.Position, boolean, boolean)">paintStone</A></B>(java.awt.Graphics2D&nbsp;g,
+<CODE>(package private) &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#paintStone(java.awt.Graphics2D, jrummikub.model.Stone, jrummikub.model.Position, jrummikub.view.impl.StonePainter.StoneState, boolean)">paintStone</A></B>(java.awt.Graphics2D&nbsp;g,
<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone,
<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;p,
- boolean&nbsp;selected,
+ <A HREF="../../../jrummikub/view/impl/StonePainter.StoneState.html" title="enum in jrummikub.view.impl">StonePainter.StoneState</A>&nbsp;state,
boolean&nbsp;hovered)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Paints a stone</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#setHoveredStone(jrummikub.model.Stone)">setHoveredStone</A></B>(<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&nbsp;stone)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the stone over which the cursor hovers</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -486,14 +830,6 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>View.</B><B><A HREF="../../../jrummikub/view/impl/View.html#setSelectedStones(java.util.Collection)">setSelectedStones</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>(package private) &nbsp;void</CODE></FONT></TD>
<TD><CODE><B>StoneCollectionPanel.</B><B><A HREF="../../../jrummikub/view/impl/StoneCollectionPanel.html#setSelectedStones(java.util.Collection)">setSelectedStones</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;selectedStones)</CODE>
@@ -518,11 +854,11 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#setStones(java.lang.Iterable)">setStones</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stones)</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>View.</B><B><A HREF="../../../jrummikub/view/impl/View.html#setSelectedStones(java.util.Collection)">setSelectedStones</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the list of stones that can be clicked on</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -532,6 +868,14 @@ Uses of <A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AbstractStonePanel.</B><B><A HREF="../../../jrummikub/view/impl/AbstractStonePanel.html#setStones(java.lang.Iterable)">setStones</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the list of stones that can be clicked on</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/doc/jrummikub/model/class-use/StoneColor.html b/doc/jrummikub/model/class-use/StoneColor.html
index 9333b62..315c5e8 100644
--- a/doc/jrummikub/model/class-use/StoneColor.html
+++ b/doc/jrummikub/model/class-use/StoneColor.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.StoneColor
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -90,9 +90,78 @@ function windowTitle()
Packages that use <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.ai"><B>jrummikub.ai</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.view"><B>jrummikub.view</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.view.impl"><B>jrummikub.view.impl</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.ai"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A> declared as <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></CODE></FONT></TD>
+<TD><CODE><B>TurnLogic.StoneState.</B><B><A HREF="../../../jrummikub/ai/TurnLogic.StoneState.html#color">color</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></CODE></FONT></TD>
+<TD><CODE><B>TurnLogic.</B><B><A HREF="../../../jrummikub/ai/TurnLogic.html#maxColor">maxColor</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></CODE></FONT></TD>
+<TD><CODE><B>TurnLogic.</B><B><A HREF="../../../jrummikub/ai/TurnLogic.html#minColor">minColor</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A> with type parameters of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.ArrayList&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TurnLogic.</B><B><A HREF="../../../jrummikub/ai/TurnLogic.html#stoneColors">stoneColors</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -108,6 +177,46 @@ Uses of <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummi
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></CODE></FONT></TD>
+<TD><CODE><B>Stone.</B><B><A HREF="../../../jrummikub/model/Stone.html#color">color</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with type parameters of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;java.util.Comparator&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>Hand.</B><B><A HREF="../../../jrummikub/model/Hand.html#comparator">comparator</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The measure to compare the stones by</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.HashSet&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>GameSettings.</B><B><A HREF="../../../jrummikub/model/GameSettings.html#stoneColors">stoneColors</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -141,6 +250,64 @@ the order they are declared.</TD>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.util.TreeMap&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B>Hand.</B><B><A HREF="../../../jrummikub/model/Hand.html#countStones(java.util.List)">countStones</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt;&nbsp;stones)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Counts the numbers of stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.util.Set&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>GameSettings.</B><B><A HREF="../../../jrummikub/model/GameSettings.html#getStoneColors()">getStoneColors</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get stone colors used</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with type arguments of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Hand.</B><B><A HREF="../../../jrummikub/model/Hand.html#incrementStoneCount(java.util.TreeMap, jrummikub.util.Pair)">incrementStoneCount</A></B>(java.util.TreeMap&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;&nbsp;stones,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&nbsp;stone)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Increments the count of a stone in the list of all stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private static&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Hand.</B><B><A HREF="../../../jrummikub/model/Hand.html#incrementStoneCount(java.util.TreeMap, jrummikub.util.Pair)">incrementStoneCount</A></B>(java.util.TreeMap&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;,java.lang.Integer&gt;&nbsp;stones,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&nbsp;stone)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Increments the count of a stone in the list of all stones</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>GameSettings.</B><B><A HREF="../../../jrummikub/model/GameSettings.html#setStoneColors(java.util.Set)">setStoneColors</A></B>(java.util.Set&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&nbsp;stoneColors)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set stone colors used</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with parameters of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -159,6 +326,132 @@ the order they are declared.</TD>
</TABLE>
&nbsp;
<P>
+<A NAME="jrummikub.view"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> in <A HREF="../../../jrummikub/view/package-summary.html">jrummikub.view</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/package-summary.html">jrummikub.view</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;java.util.Set&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>ISettingsPanel.</B><B><A HREF="../../../jrummikub/view/ISettingsPanel.html#getChangeStoneColorsEvent()">getChangeStoneColorsEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The change Stone colors event is emitted when the user chooses the stone
+ colors to play with.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.view.impl"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A> in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with type parameters of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;java.util.Set&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>SettingsPanel.</B><B><A HREF="../../../jrummikub/view/impl/SettingsPanel.html#changeStoneColorsEvent">changeStoneColorsEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Map&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>,javax.swing.JToggleButton&gt;</CODE></FONT></TD>
+<TD><CODE><B>SettingsPanel.</B><B><A HREF="../../../jrummikub/view/impl/SettingsPanel.html#colorButtons">colorButtons</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Map&lt;<A HREF="../../../jrummikub/view/impl/StonePainter.StoneState.html" title="enum in jrummikub.view.impl">StonePainter.StoneState</A>,java.util.Map&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>,java.util.Map&lt;java.lang.Integer,java.awt.image.BufferedImage&gt;&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#defaultStones">defaultStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Map&lt;<A HREF="../../../jrummikub/view/impl/StonePainter.StoneState.html" title="enum in jrummikub.view.impl">StonePainter.StoneState</A>,java.util.Map&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>,java.util.Map&lt;java.lang.Integer,java.awt.image.BufferedImage&gt;&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#hoveredStones">hoveredStones</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;java.util.Set&lt;<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>SettingsPanel.</B><B><A HREF="../../../jrummikub/view/impl/SettingsPanel.html#getChangeStoneColorsEvent()">getChangeStoneColorsEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with parameters of type <A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>SettingsPanel.</B><B><A HREF="../../../jrummikub/view/impl/SettingsPanel.html#createColorButton(jrummikub.model.StoneColor)">createColorButton</A></B>(<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&nbsp;color)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) static&nbsp;java.awt.Color</CODE></FONT></TD>
+<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#getColor(jrummikub.model.StoneColor)">getColor</A></B>(<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&nbsp;color)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.awt.image.BufferedImage</CODE></FONT></TD>
+<TD><CODE><B>StonePainter.</B><B><A HREF="../../../jrummikub/view/impl/StonePainter.html#getStoneImage(jrummikub.model.StoneColor, int, jrummikub.view.impl.StonePainter.StoneState, boolean)">getStoneImage</A></B>(<A HREF="../../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A>&nbsp;color,
+ int&nbsp;value,
+ <A HREF="../../../jrummikub/view/impl/StonePainter.StoneState.html" title="enum in jrummikub.view.impl">StonePainter.StoneState</A>&nbsp;state,
+ boolean&nbsp;hovered)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<HR>
diff --git a/doc/jrummikub/model/class-use/StoneHeap.html b/doc/jrummikub/model/class-use/StoneHeap.html
index d1751c1..55975f5 100644
--- a/doc/jrummikub/model/class-use/StoneHeap.html
+++ b/doc/jrummikub/model/class-use/StoneHeap.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.StoneHeap
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -108,24 +108,40 @@ Uses of <A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummi
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></CODE></FONT></TD>
-<TD><CODE><B>GameState.</B><B><A HREF="../../../jrummikub/model/GameState.html#getGameHeap()">getGameHeap</A></B>()</CODE>
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#stoneHeap">stoneHeap</A></B></CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></FONT></TH>
+</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></CODE></FONT></TD>
-<TD><CODE><B>IGameState.</B><B><A HREF="../../../jrummikub/model/IGameState.html#getGameHeap()">getGameHeap</A></B>()</CODE>
+<TD><CODE><B>IRoundState.</B><B><A HREF="../../../jrummikub/model/IRoundState.html#getStoneHeap()">getStoneHeap</A></B>()</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the heap of stones to draw from</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model">StoneHeap</A></CODE></FONT></TD>
+<TD><CODE><B>RoundState.</B><B><A HREF="../../../jrummikub/model/RoundState.html#getStoneHeap()">getStoneHeap</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/doc/jrummikub/model/class-use/StoneSet.Type.html b/doc/jrummikub/model/class-use/StoneSet.Type.html
index 1b74fef..729b68e 100644
--- a/doc/jrummikub/model/class-use/StoneSet.Type.html
+++ b/doc/jrummikub/model/class-use/StoneSet.Type.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.StoneSet.Type
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -112,15 +112,6 @@ Uses of <A HREF="../../../jrummikub/model/StoneSet.Type.html" title="enum in jru
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A></CODE></FONT></TD>
-<TD><CODE><B>StoneSet.</B><B><A HREF="../../../jrummikub/model/StoneSet.html#classify()">classify</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet and determine whether the set
- is a group or a run</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;<A HREF="../../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A></CODE></FONT></TD>
<TD><CODE><B>StoneSet.Type.</B><B><A HREF="../../../jrummikub/model/StoneSet.Type.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String&nbsp;name)</CODE>
@@ -139,6 +130,32 @@ the order they are declared.</TD>
</TABLE>
&nbsp;
<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A>,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B>StoneSet.</B><B><A HREF="../../../jrummikub/model/StoneSet.html#classify(jrummikub.model.GameSettings)">classify</A></B>(<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within the StoneSet and determine whether the set is
+ a group or a run</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model">StoneSet.Type</A>,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B>StoneSet.</B><B><A HREF="../../../jrummikub/model/StoneSet.html#classifyJokersOnly(jrummikub.model.GameSettings)">classifyJokersOnly</A></B>(<A HREF="../../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;settings)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test for rule conflict within a StoneSet with jokers only and determine
+ whether the set is a group or a run</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<HR>
diff --git a/doc/jrummikub/model/class-use/StoneSet.html b/doc/jrummikub/model/class-use/StoneSet.html
index ed2b6a5..82ccfa3 100644
--- a/doc/jrummikub/model/class-use/StoneSet.html
+++ b/doc/jrummikub/model/class-use/StoneSet.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.StoneSet
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -90,6 +90,18 @@ function windowTitle()
Packages that use <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.ai"><B>jrummikub.ai</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control"><B>jrummikub.control</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control.turn"><B>jrummikub.control.turn</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
@@ -104,6 +116,163 @@ Packages that use <A HREF="../../../jrummikub/model/StoneSet.html" title="class
</TABLE>
&nbsp;
<P>
+<A NAME="jrummikub.ai"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A> in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/ai/package-summary.html">jrummikub.ai</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TurnLogic.</B><B><A HREF="../../../jrummikub/ai/TurnLogic.html#getResult()">getResult</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the found stones and create output sets</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A> in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with type parameters of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.ArrayList&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>RoundControl.InvalidTurnInfo.</B><B><A HREF="../../../jrummikub/control/RoundControl.InvalidTurnInfo.html#invalidSets">invalidSets</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>RoundControl.InvalidTurnInfo.</B><B><A HREF="../../../jrummikub/control/RoundControl.InvalidTurnInfo.html#getInvalidSets()">getInvalidSets</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Getter for the invalid sets</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructor parameters in <A HREF="../../../jrummikub/control/package-summary.html">jrummikub.control</A> with type arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/control/RoundControl.InvalidTurnInfo.html#RoundControl.InvalidTurnInfo(jrummikub.model.ITable, jrummikub.control.RoundControl.InvalidTurnType, java.util.Collection)">RoundControl.InvalidTurnInfo</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;table,
+ <A HREF="../../../jrummikub/control/RoundControl.InvalidTurnType.html" title="enum in jrummikub.control">RoundControl.InvalidTurnType</A>&nbsp;type,
+ java.util.Collection&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;&nbsp;invalidSets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates new InvalidTurnInfo</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control.turn"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A> in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#invalidStoneSets()">invalidStoneSets</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) static&nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#tableSetDifference(jrummikub.model.ITable, jrummikub.model.ITable)">tableSetDifference</A></B>(<A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;oldTable,
+ <A HREF="../../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>&nbsp;newTable)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#touchedStoneSets()">touchedStoneSets</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with parameters of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>HumanTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#connectorClick(jrummikub.model.StoneSet, boolean)">connectorClick</A></B>(<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ boolean&nbsp;right)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with type arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>AIControl.</B><B><A HREF="../../../jrummikub/control/turn/AIControl.html#doNotMoveExistingSets(java.util.List)">doNotMoveExistingSets</A></B>(java.util.List&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;&nbsp;result)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<A NAME="jrummikub.model"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
@@ -116,6 +285,22 @@ Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummik
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> declared as <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></CODE></FONT></TD>
+<TD><CODE><B>Table.StoneInfo.</B><B><A HREF="../../../jrummikub/model/Table.StoneInfo.html#set">set</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> that return <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -184,6 +369,32 @@ Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummik
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Joins StoneSet to another StoneSet and returns the resulting new StoneSet</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>Table.</B><B><A HREF="../../../jrummikub/model/Table.html#splitSet(jrummikub.model.StoneSet, jrummikub.model.Position, int)">splitSet</A></B>(<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;setPosition,
+ int&nbsp;stonePosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Splits a stone set at a specified position</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/model/package-summary.html">jrummikub.model</A> with parameters of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/model/Table.StoneInfo.html#Table.StoneInfo(jrummikub.model.StoneSet, jrummikub.model.Position, int)">Table.StoneInfo</A></B>(<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;set,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;setPosition,
+ int&nbsp;stonePosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -230,6 +441,14 @@ Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummik
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>IView.</B><B><A HREF="../../../jrummikub/view/IView.html#setInvalidStoneSets(java.util.Collection)">setInvalidStoneSets</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;&nbsp;sets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set invalid sets to enable showing</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B>ITablePanel.</B><B><A HREF="../../../jrummikub/view/ITablePanel.html#setStoneSets(java.lang.Iterable)">setStoneSets</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stoneSets)</CODE>
<BR>
@@ -250,6 +469,78 @@ Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummik
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> declared as <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#leftHoveredConnector">leftHoveredConnector</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#rightHoveredConnector">rightHoveredConnector</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Fields in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with type parameters of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.Collection&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#invalidStoneSets">invalidStoneSets</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#leftConnectorClickEvent">leftConnectorClickEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.util.List&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#pauseStoneSets">pauseStoneSets</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#rightConnectorClickEvent">rightConnectorClickEvent</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#stoneSets">stoneSets</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> that return types with arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -274,10 +565,46 @@ Uses of <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummik
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with parameters of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#paintStoneSet(java.awt.Graphics2D, jrummikub.model.StoneSet, jrummikub.model.Position, java.awt.geom.Area, java.awt.geom.Area)">paintStoneSet</A></B>(java.awt.Graphics2D&nbsp;g,
+ <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&nbsp;stoneSet,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos,
+ java.awt.geom.Area&nbsp;connectorArea,
+ java.awt.geom.Area&nbsp;hoveredConnectorArea)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
<TH ALIGN="left" COLSPAN="2">Method parameters in <A HREF="../../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A> with type arguments of type <A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>(package private) &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#setInvalidStoneSets(java.util.Collection)">setInvalidStoneSets</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;&nbsp;sets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>View.</B><B><A HREF="../../../jrummikub/view/impl/View.html#setInvalidStoneSets(java.util.Collection)">setInvalidStoneSets</A></B>(java.util.Collection&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>&gt;&nbsp;sets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B>TablePanel.</B><B><A HREF="../../../jrummikub/view/impl/TablePanel.html#setStoneSets(java.lang.Iterable)">setStoneSets</A></B>(java.lang.Iterable&lt;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneSet.html" title="class in jrummikub.model">StoneSet</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&gt;&nbsp;stoneSets)</CODE>
diff --git a/doc/jrummikub/model/class-use/StoneTray.Direction.html b/doc/jrummikub/model/class-use/StoneTray.Direction.html
index a653204..d01447b 100644
--- a/doc/jrummikub/model/class-use/StoneTray.Direction.html
+++ b/doc/jrummikub/model/class-use/StoneTray.Direction.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.StoneTray.Direction
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -112,6 +112,16 @@ Uses of <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A></CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getMoveDirection(E, jrummikub.model.Position, jrummikub.util.Pair)">getMoveDirection</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>,<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&gt;&nbsp;blocking)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the direction to move the object in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;<A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A></CODE></FONT></TD>
<TD><CODE><B>StoneTray.Direction.</B><B><A HREF="../../../jrummikub/model/StoneTray.Direction.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String&nbsp;name)</CODE>
@@ -166,6 +176,27 @@ the order they are declared.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#drop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">drop</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Subroutine to "drop" to consider and determine the direction the objects
+ dropped one collides with position-wise evade in</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#dropUnchecked(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">dropUnchecked</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;direction)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Subroutine to "drop" to execute the actual drop</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>protected &nbsp;<A HREF="../../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>,<A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&gt;</CODE></FONT></TD>
<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#fixInvalidDrop(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction)">fixInvalidDrop</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;pos,
@@ -185,6 +216,18 @@ the order they are declared.</TD>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></CODE></FONT></TD>
+<TD><CODE><B>StoneTray.</B><B><A HREF="../../../jrummikub/model/StoneTray.html#getNewPosition(E, jrummikub.model.Position, jrummikub.model.StoneTray.Direction, E, jrummikub.model.Position)">getNewPosition</A></B>(<A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;object,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;position,
+ <A HREF="../../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model">StoneTray.Direction</A>&nbsp;newDirection,
+ <A HREF="../../../jrummikub/model/StoneTray.html" title="type parameter in StoneTray">E</A>&nbsp;currentObject,
+ <A HREF="../../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A>&nbsp;currentPosition)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<P>
diff --git a/doc/jrummikub/model/class-use/StoneTray.html b/doc/jrummikub/model/class-use/StoneTray.html
index a6a0e9b..802e8db 100644
--- a/doc/jrummikub/model/class-use/StoneTray.html
+++ b/doc/jrummikub/model/class-use/StoneTray.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.StoneTray
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/class-use/Table.html b/doc/jrummikub/model/class-use/Table.html
index 05e997e..bc4dba3 100644
--- a/doc/jrummikub/model/class-use/Table.html
+++ b/doc/jrummikub/model/class-use/Table.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.model.Table
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
diff --git a/doc/jrummikub/model/package-frame.html b/doc/jrummikub/model/package-frame.html
index cf1f069..2d62dc5 100644
--- a/doc/jrummikub/model/package-frame.html
+++ b/doc/jrummikub/model/package-frame.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
jrummikub.model
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -23,12 +23,12 @@ jrummikub.model
Interfaces</FONT>&nbsp;
<FONT CLASS="FrameItemFont">
<BR>
-<A HREF="IGameState.html" title="interface in jrummikub.model" target="classFrame"><I>IGameState</I></A>
-<BR>
<A HREF="IHand.html" title="interface in jrummikub.model" target="classFrame"><I>IHand</I></A>
<BR>
<A HREF="IPlayer.html" title="interface in jrummikub.model" target="classFrame"><I>IPlayer</I></A>
<BR>
+<A HREF="IRoundState.html" title="interface in jrummikub.model" target="classFrame"><I>IRoundState</I></A>
+<BR>
<A HREF="IStoneTray.html" title="interface in jrummikub.model" target="classFrame"><I>IStoneTray</I></A>
<BR>
<A HREF="ITable.html" title="interface in jrummikub.model" target="classFrame"><I>ITable</I></A>
@@ -44,14 +44,22 @@ Interfaces</FONT>&nbsp;
Classes</FONT>&nbsp;
<FONT CLASS="FrameItemFont">
<BR>
+<A HREF="GameSettings.html" title="class in jrummikub.model" target="classFrame">GameSettings</A>
+<BR>
<A HREF="GameState.html" title="class in jrummikub.model" target="classFrame">GameState</A>
<BR>
<A HREF="Hand.html" title="class in jrummikub.model" target="classFrame">Hand</A>
<BR>
<A HREF="Player.html" title="class in jrummikub.model" target="classFrame">Player</A>
<BR>
+<A HREF="PlayerSettings.html" title="class in jrummikub.model" target="classFrame">PlayerSettings</A>
+<BR>
<A HREF="Position.html" title="class in jrummikub.model" target="classFrame">Position</A>
<BR>
+<A HREF="RoundState.html" title="class in jrummikub.model" target="classFrame">RoundState</A>
+<BR>
+<A HREF="Score.html" title="class in jrummikub.model" target="classFrame">Score</A>
+<BR>
<A HREF="Stone.html" title="class in jrummikub.model" target="classFrame">Stone</A>
<BR>
<A HREF="StoneHeap.html" title="class in jrummikub.model" target="classFrame">StoneHeap</A>
@@ -60,7 +68,9 @@ Classes</FONT>&nbsp;
<BR>
<A HREF="StoneTray.html" title="class in jrummikub.model" target="classFrame">StoneTray</A>
<BR>
-<A HREF="Table.html" title="class in jrummikub.model" target="classFrame">Table</A></FONT></TD>
+<A HREF="Table.html" title="class in jrummikub.model" target="classFrame">Table</A>
+<BR>
+<A HREF="Table.StoneInfo.html" title="class in jrummikub.model" target="classFrame">Table.StoneInfo</A></FONT></TD>
</TR>
</TABLE>
@@ -71,6 +81,8 @@ Classes</FONT>&nbsp;
Enums</FONT>&nbsp;
<FONT CLASS="FrameItemFont">
<BR>
+<A HREF="PlayerSettings.Type.html" title="enum in jrummikub.model" target="classFrame">PlayerSettings.Type</A>
+<BR>
<A HREF="StoneColor.html" title="enum in jrummikub.model" target="classFrame">StoneColor</A>
<BR>
<A HREF="StoneSet.Type.html" title="enum in jrummikub.model" target="classFrame">StoneSet.Type</A>
diff --git a/doc/jrummikub/model/package-summary.html b/doc/jrummikub/model/package-summary.html
index c5e4189..35ee656 100644
--- a/doc/jrummikub/model/package-summary.html
+++ b/doc/jrummikub/model/package-summary.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
jrummikub.model
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,8 +55,8 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/control/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/util/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/turn/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/server/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/package-summary.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -89,10 +89,6 @@ Package jrummikub.model
<B>Interface Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A></B></TD>
-<TD>Interface for <A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><CODE>GameState</CODE></A> model</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A></B></TD>
<TD>Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A> model</TD>
</TR>
@@ -101,6 +97,10 @@ Package jrummikub.model
<TD>Interface for <A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><CODE>Player</CODE></A> model</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A></B></TD>
+<TD>Interface for <A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><CODE>RoundState</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray&lt;E extends Sizeable&gt;</A></B></TD>
<TD>Interface for the <A HREF="../../jrummikub/model/StoneTray.html" title="class in jrummikub.model"><CODE>StoneTray</CODE></A> model</TD>
</TR>
@@ -123,8 +123,12 @@ Package jrummikub.model
<B>Class Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A></B></TD>
+<TD>The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></B></TD>
-<TD>Class managing the overall and momentary GameState</TD>
+<TD>Class that stores information for a game of multiple rounds</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model">Hand</A></B></TD>
@@ -135,11 +139,23 @@ Package jrummikub.model
<TD>Class managing player data.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A></B></TD>
+<TD>The settings of a player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model">Position</A></B></TD>
<TD><A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A> Position class to determine positions on <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A> or
<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model">RoundState</A></B></TD>
+<TD>Class managing the overall and momentary RoundState</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A></B></TD>
+<TD>Score of a single round</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A></B></TD>
<TD>Basic Rummikub Stone</TD>
</TR>
@@ -161,6 +177,10 @@ Package jrummikub.model
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model">Table</A></B></TD>
<TD>Class administering the <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A>s on the game-Table</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model">Table.StoneInfo</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
@@ -172,6 +192,10 @@ Package jrummikub.model
<B>Enum Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/PlayerSettings.Type.html" title="enum in jrummikub.model">PlayerSettings.Type</A></B></TD>
+<TD>Type of turn control.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model">StoneColor</A></B></TD>
<TD>Class specifying possible StoneColors</TD>
</TR>
@@ -219,8 +243,8 @@ Package jrummikub.model
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/control/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/util/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/turn/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/server/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/package-summary.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/model/package-tree.html b/doc/jrummikub/model/package-tree.html
index 7401a62..3c88d80 100644
--- a/doc/jrummikub/model/package-tree.html
+++ b/doc/jrummikub/model/package-tree.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:05 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
jrummikub.model Class Hierarchy
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -55,8 +55,8 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/control/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/util/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/turn/package-tree.html"><B>PREV</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/server/package-tree.html"><B>NEXT</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/package-tree.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -92,28 +92,39 @@ Class Hierarchy
</H2>
<UL>
<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><B>GameState</B></A> (implements jrummikub.model.<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A>)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model"><B>GameSettings</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><B>GameState</B></A> (implements java.io.Serializable)
<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><B>Player</B></A> (implements jrummikub.model.<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model">IPlayer</A>)
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><B>Position</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><B>Stone</B></A> (implements jrummikub.model.<A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>)
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model"><B>StoneHeap</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model"><B>StoneSet</B></A> (implements java.lang.Iterable&lt;T&gt;, jrummikub.model.<A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model"><B>PlayerSettings</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Position.html" title="class in jrummikub.model"><B>Position</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><B>RoundState</B></A> (implements jrummikub.model.<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model"><B>Score</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><B>Stone</B></A> (implements java.io.Serializable, jrummikub.model.<A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneHeap.html" title="class in jrummikub.model"><B>StoneHeap</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneSet.html" title="class in jrummikub.model"><B>StoneSet</B></A> (implements java.lang.Iterable&lt;T&gt;, java.io.Serializable, jrummikub.model.<A HREF="../../jrummikub/model/Sizeable.html" title="interface in jrummikub.model">Sizeable</A>)
<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneTray.html" title="class in jrummikub.model"><B>StoneTray</B></A>&lt;E&gt; (implements jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model">IStoneTray</A>&lt;E&gt;)
<UL>
<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><B>Hand</B></A> (implements jrummikub.model.<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model">IHand</A>)
<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><B>Table</B></A> (implements jrummikub.model.<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model">ITable</A>)
</UL>
-</UL>
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/Table.StoneInfo.html" title="class in jrummikub.model"><B>Table.StoneInfo</B></A></UL>
</UL>
<H2>
Interface Hierarchy
</H2>
<UL>
<LI TYPE="circle">java.lang.Cloneable<UL>
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>IStoneTray</B></A>&lt;E&gt; (also extends java.lang.Iterable&lt;T&gt;)
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>IStoneTray</B></A>&lt;E&gt; (also extends java.lang.Iterable&lt;T&gt;, java.io.Serializable)
+<UL>
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>IHand</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>ITable</B></A></UL>
+</UL>
+<LI TYPE="circle">java.lang.Iterable&lt;T&gt;<UL>
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>IStoneTray</B></A>&lt;E&gt; (also extends java.lang.Cloneable, java.io.Serializable)
<UL>
<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>IHand</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>ITable</B></A></UL>
</UL>
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model"><B>IGameState</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model"><B>IPlayer</B></A><LI TYPE="circle">java.lang.Iterable&lt;T&gt;<UL>
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>IStoneTray</B></A>&lt;E&gt; (also extends java.lang.Cloneable)
+<LI TYPE="circle">java.io.Serializable<UL>
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IPlayer.html" title="interface in jrummikub.model"><B>IPlayer</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model"><B>IRoundState</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IStoneTray.html" title="interface in jrummikub.model"><B>IStoneTray</B></A>&lt;E&gt; (also extends java.lang.Cloneable, java.lang.Iterable&lt;T&gt;)
<UL>
<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/IHand.html" title="interface in jrummikub.model"><B>IHand</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/ITable.html" title="interface in jrummikub.model"><B>ITable</B></A></UL>
</UL>
@@ -125,7 +136,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.Object<UL>
<LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
<UL>
-<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model"><B>StoneSet.Type</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model"><B>StoneTray.Direction</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model"><B>StoneColor</B></A></UL>
+<LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneTray.Direction.html" title="enum in jrummikub.model"><B>StoneTray.Direction</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneColor.html" title="enum in jrummikub.model"><B>StoneColor</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/StoneSet.Type.html" title="enum in jrummikub.model"><B>StoneSet.Type</B></A><LI TYPE="circle">jrummikub.model.<A HREF="../../jrummikub/model/PlayerSettings.Type.html" title="enum in jrummikub.model"><B>PlayerSettings.Type</B></A></UL>
</UL>
</UL>
<HR>
@@ -158,8 +169,8 @@ Enum Hierarchy
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/control/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/util/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/turn/package-tree.html"><B>PREV</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/server/package-tree.html"><B>NEXT</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/model/package-tree.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/model/package-use.html b/doc/jrummikub/model/package-use.html
index 162cfa6..79d4f71 100644
--- a/doc/jrummikub/model/package-use.html
+++ b/doc/jrummikub/model/package-use.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:05:06 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Package jrummikub.model
</TITLE>
-<META NAME="date" CONTENT="2011-05-10">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -90,14 +90,30 @@ function windowTitle()
Packages that use <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.ai"><B>jrummikub.ai</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#jrummikub.control"><B>jrummikub.control</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control.network"><B>jrummikub.control.network</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.control.turn"><B>jrummikub.control.turn</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#jrummikub.model"><B>jrummikub.model</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#jrummikub.util"><B>jrummikub.util</B></A></TD>
+<TD>&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><A HREF="#jrummikub.view"><B>jrummikub.view</B></A></TD>
<TD>&nbsp;&nbsp;</TD>
</TR>
@@ -108,6 +124,39 @@ Packages that use <A HREF="../../jrummikub/model/package-summary.html">jrummikub
</TABLE>
&nbsp;
<P>
+<A NAME="jrummikub.ai"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/ai/package-summary.html">jrummikub.ai</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.ai"><B>GameSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Stone.html#jrummikub.ai"><B>Stone</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Basic Rummikub Stone</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/StoneColor.html#jrummikub.ai"><B>StoneColor</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class specifying possible StoneColors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/StoneSet.html#jrummikub.ai"><B>StoneSet</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A>s joined together to form sets</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
<A NAME="jrummikub.control"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
@@ -115,16 +164,22 @@ Packages that use <A HREF="../../jrummikub/model/package-summary.html">jrummikub
Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/control/package-summary.html">jrummikub.control</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../jrummikub/model/class-use/IGameState.html#jrummikub.control"><B>IGameState</B></A></B>
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.control"><B>GameSettings</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><CODE>GameState</CODE></A> model</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../jrummikub/model/class-use/IHand.html#jrummikub.control"><B>IHand</B></A></B>
+<TD><B><A HREF="../../jrummikub/model/class-use/GameState.html#jrummikub.control"><B>GameState</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A> model</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class that stores information for a game of multiple rounds</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IRoundState.html#jrummikub.control"><B>IRoundState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><CODE>RoundState</CODE></A> model</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/ITable.html#jrummikub.control"><B>ITable</B></A></B>
@@ -133,18 +188,120 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A> model</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../jrummikub/model/class-use/Position.html#jrummikub.control"><B>Position</B></A></B>
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.html#jrummikub.control"><B>PlayerSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The settings of a player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.Type.html#jrummikub.control"><B>PlayerSettings.Type</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type of turn control.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Score.html#jrummikub.control"><B>Score</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Score of a single round</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/StoneSet.html#jrummikub.control"><B>StoneSet</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A>s joined together to form sets</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control.network"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.control.network"><B>GameSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IRoundState.html#jrummikub.control.network"><B>IRoundState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><CODE>RoundState</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/ITable.html#jrummikub.control.network"><B>ITable</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.Type.html#jrummikub.control.network"><B>PlayerSettings.Type</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type of turn control.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.control.turn"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.control.turn"><B>GameSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IHand.html#jrummikub.control.turn"><B>IHand</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IRoundState.html#jrummikub.control.turn"><B>IRoundState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><CODE>RoundState</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/ITable.html#jrummikub.control.turn"><B>ITable</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.Type.html#jrummikub.control.turn"><B>PlayerSettings.Type</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type of turn control.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Position.html#jrummikub.control.turn"><B>Position</B></A></B>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A> Position class to determine positions on <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A> or
<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../jrummikub/model/class-use/Stone.html#jrummikub.control"><B>Stone</B></A></B>
+<TD><B><A HREF="../../jrummikub/model/class-use/Stone.html#jrummikub.control.turn"><B>Stone</B></A></B>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Basic Rummikub Stone</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/StoneSet.html#jrummikub.control.turn"><B>StoneSet</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class managing <A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model"><CODE>Stone</CODE></A>s joined together to form sets</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -155,10 +312,16 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../jrummikub/model/class-use/IGameState.html#jrummikub.model"><B>IGameState</B></A></B>
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.model"><B>GameSettings</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model"><CODE>GameState</CODE></A> model</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameState.html#jrummikub.model"><B>GameState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class that stores information for a game of multiple rounds</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/IHand.html#jrummikub.model"><B>IHand</B></A></B>
@@ -173,6 +336,12 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><CODE>Player</CODE></A> model</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IRoundState.html#jrummikub.model"><B>IRoundState</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/RoundState.html" title="class in jrummikub.model"><CODE>RoundState</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/IStoneTray.html#jrummikub.model"><B>IStoneTray</B></A></B>
<BR>
@@ -185,6 +354,24 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/model/Table.html" title="class in jrummikub.model"><CODE>Table</CODE></A> model</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Player.html#jrummikub.model"><B>Player</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class managing player data.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.html#jrummikub.model"><B>PlayerSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The settings of a player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.Type.html#jrummikub.model"><B>PlayerSettings.Type</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type of turn control.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/Position.html#jrummikub.model"><B>Position</B></A></B>
<BR>
@@ -192,6 +379,12 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Score.html#jrummikub.model"><B>Score</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Score of a single round</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/Sizeable.html#jrummikub.model"><B>Sizeable</B></A></B>
<BR>
@@ -241,6 +434,27 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Possible move directions in case of overlapping Stones/Sets</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Table.StoneInfo.html#jrummikub.model"><B>Table.StoneInfo</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="jrummikub.util"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/util/package-summary.html">jrummikub.util</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.util"><B>GameSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
</TABLE>
&nbsp;
<P>
@@ -251,6 +465,30 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/view/package-summary.html">jrummikub.view</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.view"><B>GameSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IPlayer.html#jrummikub.view"><B>IPlayer</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><CODE>Player</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.html#jrummikub.view"><B>PlayerSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The settings of a player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.Type.html#jrummikub.view"><B>PlayerSettings.Type</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type of turn control.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/Position.html#jrummikub.view"><B>Position</B></A></B>
<BR>
@@ -258,12 +496,24 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Score.html#jrummikub.view"><B>Score</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Score of a single round</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/Stone.html#jrummikub.view"><B>Stone</B></A></B>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Basic Rummikub Stone</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/StoneColor.html#jrummikub.view"><B>StoneColor</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class specifying possible StoneColors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/StoneSet.html#jrummikub.view"><B>StoneSet</B></A></B>
<BR>
@@ -279,6 +529,30 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model</A> used by <A HREF="../../jrummikub/view/impl/package-summary.html">jrummikub.view.impl</A></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/GameSettings.html#jrummikub.view.impl"><B>GameSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The overall game settings</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/IPlayer.html#jrummikub.view.impl"><B>IPlayer</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for <A HREF="../../jrummikub/model/Player.html" title="class in jrummikub.model"><CODE>Player</CODE></A> model</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.html#jrummikub.view.impl"><B>PlayerSettings</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The settings of a player</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/PlayerSettings.Type.html#jrummikub.view.impl"><B>PlayerSettings.Type</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Type of turn control.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/Position.html#jrummikub.view.impl"><B>Position</B></A></B>
<BR>
@@ -286,12 +560,24 @@ Classes in <A HREF="../../jrummikub/model/package-summary.html">jrummikub.model<
<A HREF="../../jrummikub/model/Hand.html" title="class in jrummikub.model"><CODE>Hand</CODE></A></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/Score.html#jrummikub.view.impl"><B>Score</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Score of a single round</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/Stone.html#jrummikub.view.impl"><B>Stone</B></A></B>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Basic Rummikub Stone</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/model/class-use/StoneColor.html#jrummikub.view.impl"><B>StoneColor</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class specifying possible StoneColors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/model/class-use/StoneSet.html#jrummikub.view.impl"><B>StoneSet</B></A></B>
<BR>