summaryrefslogtreecommitdiffstats
path: root/doc/jrummikub/control
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/control
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/control')
-rw-r--r--doc/jrummikub/control/ApplicationControl.html377
-rw-r--r--doc/jrummikub/control/GameControl.html474
-rw-r--r--doc/jrummikub/control/ITurnTimer.html8
-rw-r--r--doc/jrummikub/control/RoundControl.html670
-rw-r--r--doc/jrummikub/control/TurnTimer.html134
-rw-r--r--doc/jrummikub/control/class-use/ApplicationControl.html63
-rw-r--r--doc/jrummikub/control/class-use/GameControl.html87
-rw-r--r--doc/jrummikub/control/class-use/ITurnTimer.html40
-rw-r--r--doc/jrummikub/control/class-use/RoundControl.html103
-rw-r--r--doc/jrummikub/control/class-use/TurnTimer.html4
-rw-r--r--doc/jrummikub/control/package-frame.html27
-rw-r--r--doc/jrummikub/control/package-summary.html54
-rw-r--r--doc/jrummikub/control/package-tree.html28
-rw-r--r--doc/jrummikub/control/package-use.html133
14 files changed, 2075 insertions, 127 deletions
diff --git a/doc/jrummikub/control/ApplicationControl.html b/doc/jrummikub/control/ApplicationControl.html
index 3022e0c..057410d 100644
--- a/doc/jrummikub/control/ApplicationControl.html
+++ b/doc/jrummikub/control/ApplicationControl.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Wed Jun 22 11:34:50 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:54 CEST 2011 -->
<TITLE>
ApplicationControl
</TITLE>
-<META NAME="date" CONTENT="2011-06-22">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
@@ -37,7 +37,8 @@ function windowTitle()
<A NAME="navbar_top_firstrow"><!-- --></A>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
<TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../jrummikub/control/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ApplicationControl.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
@@ -54,8 +55,8 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/AbstractSettingsControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/ApplicationControl.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="ApplicationControl.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -75,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>
@@ -108,7 +109,80 @@ The application control controls the settings for a new games and create the
<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/control/GameControl.html" title="class in jrummikub.control">GameControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#gameControl">gameControl</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/control/LoginControl.html" title="class in jrummikub.control">LoginControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#loginControl">loginControl</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/control/network/NetworkControl.html" title="class in jrummikub.control.network">NetworkControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#networkControl">networkControl</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/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#saveControl">saveControl</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/server/DedicatedServer.html" title="class in jrummikub.server">DedicatedServer</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#server">server</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/control/SettingsControl.html" title="class in jrummikub.control">SettingsControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#settingsControl">settingsControl</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/Connection.html" title="interface in jrummikub.util">Connection</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#tempConnection">tempConnection</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/view/IView.html" title="interface in jrummikub.view">IView</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#view">view</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>
@@ -118,7 +192,7 @@ The application control controls the settings for a new games and create the
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#ApplicationControl(jrummikub.view.IView)">ApplicationControl</A></B>(jrummikub.view.IView&nbsp;view)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#ApplicationControl(jrummikub.view.IView)">ApplicationControl</A></B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new application control</TD>
@@ -135,6 +209,62 @@ The application control controls the settings for a new games and create the
</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/control/ApplicationControl.html#abortControls()">abortControls</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;End all controls in case of e.g. quit event</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/control/ApplicationControl.html#addGameControlListeners(jrummikub.control.GameControl)">addGameControlListeners</A></B>(<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</A>&nbsp;gameControl)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds events listeners to game control events</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/control/ApplicationControl.html#addNewNetworkGameHandler()">addNewNetworkGameHandler</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;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#addQuitGameHandlers()">addQuitGameHandlers</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;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#addSaveLoadHandlers()">addSaveLoadHandlers</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;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#createLoginControl(boolean)">createLoginControl</A></B>(boolean&nbsp;reset)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new network login control</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/control/ApplicationControl.html#createNetworkControl(jrummikub.util.LoginData)">createNetworkControl</A></B>(<A HREF="../../jrummikub/util/LoginData.html" title="class in jrummikub.util">LoginData</A>&nbsp;loginData)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new network game control</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/control/ApplicationControl.html#isGameRunning()">isGameRunning</A></B>()</CODE>
@@ -143,6 +273,22 @@ The application control controls the settings for a new games and create the
</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/control/ApplicationControl.html#showQuitWarning()">showQuitWarning</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;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#showRestartWarning()">showRestartWarning</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;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#startApplication()">startApplication</A></B>()</CODE>
@@ -160,7 +306,7 @@ The application control controls the settings for a new games and create the
<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/control/ApplicationControl.html#updateDedicatedServerPassword(jrummikub.util.LoginData)">updateDedicatedServerPassword</A></B>(jrummikub.util.LoginData&nbsp;loginData)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/control/ApplicationControl.html#updateDedicatedServerPassword(jrummikub.util.LoginData)">updateDedicatedServerPassword</A></B>(<A HREF="../../jrummikub/util/LoginData.html" title="class in jrummikub.util">LoginData</A>&nbsp;loginData)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;If the login given is to our own dedicated server, update it's password
@@ -173,12 +319,101 @@ The application control controls the settings for a new games and create the
<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
</TR>
</TABLE>
&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="settingsControl"><!-- --></A><H3>
+settingsControl</H3>
+<PRE>
+private <A HREF="../../jrummikub/control/SettingsControl.html" title="class in jrummikub.control">SettingsControl</A> <B>settingsControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="loginControl"><!-- --></A><H3>
+loginControl</H3>
+<PRE>
+private <A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control">LoginControl</A> <B>loginControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="networkControl"><!-- --></A><H3>
+networkControl</H3>
+<PRE>
+private <A HREF="../../jrummikub/control/network/NetworkControl.html" title="class in jrummikub.control.network">NetworkControl</A> <B>networkControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="saveControl"><!-- --></A><H3>
+saveControl</H3>
+<PRE>
+private <A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A> <B>saveControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="gameControl"><!-- --></A><H3>
+gameControl</H3>
+<PRE>
+private <A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</A> <B>gameControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="tempConnection"><!-- --></A><H3>
+tempConnection</H3>
+<PRE>
+private <A HREF="../../jrummikub/util/Connection.html" title="interface in jrummikub.util">Connection</A> <B>tempConnection</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="server"><!-- --></A><H3>
+server</H3>
+<PRE>
+private <A HREF="../../jrummikub/server/DedicatedServer.html" title="class in jrummikub.server">DedicatedServer</A> <B>server</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="view"><!-- --></A><H3>
+view</H3>
+<PRE>
+private <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A> <B>view</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -192,7 +427,7 @@ The application control controls the settings for a new games and create the
<A NAME="ApplicationControl(jrummikub.view.IView)"><!-- --></A><H3>
ApplicationControl</H3>
<PRE>
-public <B>ApplicationControl</B>(jrummikub.view.IView&nbsp;view)</PRE>
+public <B>ApplicationControl</B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</PRE>
<DL>
<DD>Creates a new application control
<P>
@@ -210,6 +445,61 @@ public <B>ApplicationControl</B>(jrummikub.view.IView&nbsp;view)</PRE>
</TR>
</TABLE>
+<A NAME="addSaveLoadHandlers()"><!-- --></A><H3>
+addSaveLoadHandlers</H3>
+<PRE>
+private void <B>addSaveLoadHandlers</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="addNewNetworkGameHandler()"><!-- --></A><H3>
+addNewNetworkGameHandler</H3>
+<PRE>
+private void <B>addNewNetworkGameHandler</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="addQuitGameHandlers()"><!-- --></A><H3>
+addQuitGameHandlers</H3>
+<PRE>
+private void <B>addQuitGameHandlers</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="showRestartWarning()"><!-- --></A><H3>
+showRestartWarning</H3>
+<PRE>
+private void <B>showRestartWarning</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="showQuitWarning()"><!-- --></A><H3>
+showQuitWarning</H3>
+<PRE>
+private void <B>showQuitWarning</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="isGameRunning()"><!-- --></A><H3>
isGameRunning</H3>
<PRE>
@@ -224,6 +514,32 @@ public boolean <B>isGameRunning</B>()</PRE>
</DL>
<HR>
+<A NAME="createLoginControl(boolean)"><!-- --></A><H3>
+createLoginControl</H3>
+<PRE>
+private void <B>createLoginControl</B>(boolean&nbsp;reset)</PRE>
+<DL>
+<DD>Create a new network login control
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="abortControls()"><!-- --></A><H3>
+abortControls</H3>
+<PRE>
+private void <B>abortControls</B>()</PRE>
+<DL>
+<DD>End all controls in case of e.g. quit event
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="startApplication()"><!-- --></A><H3>
startApplication</H3>
<PRE>
@@ -237,6 +553,32 @@ public void <B>startApplication</B>()</PRE>
</DL>
<HR>
+<A NAME="addGameControlListeners(jrummikub.control.GameControl)"><!-- --></A><H3>
+addGameControlListeners</H3>
+<PRE>
+private void <B>addGameControlListeners</B>(<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</A>&nbsp;gameControl)</PRE>
+<DL>
+<DD>Adds events listeners to game control events
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>gameControl</CODE> - of current game</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="createNetworkControl(jrummikub.util.LoginData)"><!-- --></A><H3>
+createNetworkControl</H3>
+<PRE>
+private void <B>createNetworkControl</B>(<A HREF="../../jrummikub/util/LoginData.html" title="class in jrummikub.util">LoginData</A>&nbsp;loginData)</PRE>
+<DL>
+<DD>Create a new network game control
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>loginData</CODE> - users login data for channel</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="startDedicatedServer(java.lang.String)"><!-- --></A><H3>
startDedicatedServer</H3>
<PRE>
@@ -254,7 +596,7 @@ public boolean <B>startDedicatedServer</B>(java.lang.String&nbsp;password)</PRE>
<A NAME="updateDedicatedServerPassword(jrummikub.util.LoginData)"><!-- --></A><H3>
updateDedicatedServerPassword</H3>
<PRE>
-public void <B>updateDedicatedServerPassword</B>(jrummikub.util.LoginData&nbsp;loginData)</PRE>
+public void <B>updateDedicatedServerPassword</B>(<A HREF="../../jrummikub/util/LoginData.html" title="class in jrummikub.util">LoginData</A>&nbsp;loginData)</PRE>
<DL>
<DD>If the login given is to our own dedicated server, update it's password
to match
@@ -276,7 +618,8 @@ public void <B>updateDedicatedServerPassword</B>(jrummikub.util.LoginData&nbsp;l
<A NAME="navbar_bottom_firstrow"><!-- --></A>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
<TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../jrummikub/control/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ApplicationControl.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
@@ -293,8 +636,8 @@ public void <B>updateDedicatedServerPassword</B>(jrummikub.util.LoginData&nbsp;l
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/AbstractSettingsControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/ApplicationControl.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="ApplicationControl.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -314,9 +657,9 @@ public void <B>updateDedicatedServerPassword</B>(jrummikub.util.LoginData&nbsp;l
</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/control/GameControl.html b/doc/jrummikub/control/GameControl.html
index 1359550..1f3bf4b 100644
--- a/doc/jrummikub/control/GameControl.html
+++ b/doc/jrummikub/control/GameControl.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:56 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:54 CEST 2011 -->
<TITLE>
GameControl
</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/control/ApplicationControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/GameControl.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>
@@ -95,6 +95,9 @@ Class GameControl</H2>
java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.control.GameControl</B>
</PRE>
+<DL>
+<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../jrummikub/control/network/NetworkGameControl.html" title="class in jrummikub.control.network">NetworkGameControl</A></DD>
+</DL>
<HR>
<DL>
<DT><PRE>public class <B>GameControl</B><DT>extends java.lang.Object</DL>
@@ -108,7 +111,72 @@ Controls a Game, at some point including all Rounds, starts new Rounds
<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>protected &nbsp;java.util.List&lt;<A HREF="../../jrummikub/util/Connection.html" title="interface in jrummikub.util">Connection</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#connections">connections</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>protected &nbsp;<A HREF="../../jrummikub/util/Event.html" title="class in jrummikub.util">Event</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#endOfGameEvent">endOfGameEvent</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>protected &nbsp;<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.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>protected &nbsp;<A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A></CODE></FONT></TD>
+<TD><CODE><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>protected &nbsp;<A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#roundControl">roundControl</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>protected &nbsp;<A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#saveControl">saveControl</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>protected &nbsp;<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#view">view</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>
@@ -118,7 +186,9 @@ Controls a Game, at some point including all Rounds, starts new Rounds
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#GameControl(jrummikub.view.IView)">GameControl</A></B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#GameControl(jrummikub.model.GameSettings, jrummikub.control.SaveControl, jrummikub.view.IView)">GameControl</A></B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;gameSettings,
+ <A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A>&nbsp;saveControl,
+ <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor</TD>
@@ -136,11 +206,125 @@ Controls a Game, at some point including all Rounds, starts new Rounds
<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/control/GameControl.html#abortGame()">abortGame</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clean abortion of a running game when another one is loaded or when a new
+ one is started</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/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>protected &nbsp;<A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#createRoundControl(jrummikub.model.IRoundState)">createRoundControl</A></B>(<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;Creates a new round control with the specified round state</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#createRoundState()">createRoundState</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a new round State</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/control/GameControl.html#endGame()">endGame</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Ends the running game</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/control/GameControl.html#endOfRound(jrummikub.model.Score)">endOfRound</A></B>(<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&nbsp;roundScore)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the score and default values for saving when round ends</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/control/GameControl.html#endProgram()">endProgram</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Exits System without warnings if no game control is active</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../jrummikub/util/IEvent.html" title="interface in jrummikub.util">IEvent</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#getEndOfGameEvent()">getEndOfGameEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Is emitted when the user ends the game and start a new one</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/control/GameControl.html#prepareRound(jrummikub.model.IRoundState)">prepareRound</A></B>(<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;Prepare a new round by setting start player, adding listeners</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/control/GameControl.html#removeListeners()">removeListeners</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Removes all listeners from the connection</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/control/GameControl.html#restartRound()">restartRound</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Restarts round after redealing</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/control/GameControl.html#showScorePanel()">showScorePanel</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets score panel visible</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><A HREF="../../jrummikub/control/GameControl.html#showWinPanel()">showWinPanel</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;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/control/GameControl.html#startGame()">startGame</A></B>()</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Game gets started by initializing the first Round</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><A HREF="../../jrummikub/control/GameControl.html#startRound()">startRound</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Start a new round within the existing game</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -154,6 +338,85 @@ Controls a Game, at some point including all Rounds, starts new Rounds
&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="saveControl"><!-- --></A><H3>
+saveControl</H3>
+<PRE>
+protected <A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A> <B>saveControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="gameSettings"><!-- --></A><H3>
+gameSettings</H3>
+<PRE>
+protected <A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A> <B>gameSettings</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="view"><!-- --></A><H3>
+view</H3>
+<PRE>
+protected <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A> <B>view</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="roundControl"><!-- --></A><H3>
+roundControl</H3>
+<PRE>
+protected <A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A> <B>roundControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="gameState"><!-- --></A><H3>
+gameState</H3>
+<PRE>
+protected <A HREF="../../jrummikub/model/GameState.html" title="class in jrummikub.model">GameState</A> <B>gameState</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="connections"><!-- --></A><H3>
+connections</H3>
+<PRE>
+protected java.util.List&lt;<A HREF="../../jrummikub/util/Connection.html" title="interface in jrummikub.util">Connection</A>&gt; <B>connections</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="endOfGameEvent"><!-- --></A><H3>
+endOfGameEvent</H3>
+<PRE>
+protected <A HREF="../../jrummikub/util/Event.html" title="class in jrummikub.util">Event</A> <B>endOfGameEvent</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -164,15 +427,17 @@ Controls a Game, at some point including all Rounds, starts new Rounds
</TR>
</TABLE>
-<A NAME="GameControl(jrummikub.view.IView)"><!-- --></A><H3>
+<A NAME="GameControl(jrummikub.model.GameSettings, jrummikub.control.SaveControl, jrummikub.view.IView)"><!-- --></A><H3>
GameControl</H3>
<PRE>
-public <B>GameControl</B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</PRE>
+public <B>GameControl</B>(<A HREF="../../jrummikub/model/GameSettings.html" title="class in jrummikub.model">GameSettings</A>&nbsp;gameSettings,
+ <A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A>&nbsp;saveControl,
+ <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</PRE>
<DL>
<DD>Constructor
<P>
<DL>
-<DT><B>Parameters:</B><DD><CODE>view</CODE> - the view</DL>
+<DT><B>Parameters:</B><DD><CODE>gameSettings</CODE> - the game settings<DD><CODE>saveControl</CODE> - the save control<DD><CODE>view</CODE> - the view</DL>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -185,6 +450,46 @@ public <B>GameControl</B>(<A HREF="../../jrummikub/view/IView.html" title="inter
</TR>
</TABLE>
+<A NAME="getEndOfGameEvent()"><!-- --></A><H3>
+getEndOfGameEvent</H3>
+<PRE>
+public <A HREF="../../jrummikub/util/IEvent.html" title="interface in jrummikub.util">IEvent</A> <B>getEndOfGameEvent</B>()</PRE>
+<DL>
+<DD>Is emitted when the user ends the game and start a new one
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the endOfGameEvent</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="endGame()"><!-- --></A><H3>
+endGame</H3>
+<PRE>
+private void <B>endGame</B>()</PRE>
+<DL>
+<DD>Ends the running game
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="removeListeners()"><!-- --></A><H3>
+removeListeners</H3>
+<PRE>
+private void <B>removeListeners</B>()</PRE>
+<DL>
+<DD>Removes all listeners from the connection
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="startGame()"><!-- --></A><H3>
startGame</H3>
<PRE>
@@ -196,6 +501,151 @@ public void <B>startGame</B>()</PRE>
</DL>
</DD>
</DL>
+<HR>
+
+<A NAME="continueGame(jrummikub.model.GameState, jrummikub.model.IRoundState)"><!-- --></A><H3>
+continueGame</H3>
+<PRE>
+public void <B>continueGame</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)</PRE>
+<DL>
+<DD>Continues game after loading
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>gameState</CODE> - the saved GameState (Players, startplayer, points)<DD><CODE>roundState</CODE> - the saved RoundState (activePlayer, Table, heap etc)</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="abortGame()"><!-- --></A><H3>
+abortGame</H3>
+<PRE>
+public void <B>abortGame</B>()</PRE>
+<DL>
+<DD>Clean abortion of a running game when another one is loaded or when a new
+ one is started
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="startRound()"><!-- --></A><H3>
+startRound</H3>
+<PRE>
+protected void <B>startRound</B>()</PRE>
+<DL>
+<DD>Start a new round within the existing game
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="prepareRound(jrummikub.model.IRoundState)"><!-- --></A><H3>
+prepareRound</H3>
+<PRE>
+private void <B>prepareRound</B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState)</PRE>
+<DL>
+<DD>Prepare a new round by setting start player, adding listeners
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>roundState</CODE> - of current round</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="createRoundState()"><!-- --></A><H3>
+createRoundState</H3>
+<PRE>
+protected <A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A> <B>createRoundState</B>()</PRE>
+<DL>
+<DD>Creates a new round State
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the round state</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="createRoundControl(jrummikub.model.IRoundState)"><!-- --></A><H3>
+createRoundControl</H3>
+<PRE>
+protected <A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A> <B>createRoundControl</B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState)</PRE>
+<DL>
+<DD>Creates a new round control with the specified round state
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>roundState</CODE> - for new round control
+<DT><B>Returns:</B><DD>the round control</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="restartRound()"><!-- --></A><H3>
+restartRound</H3>
+<PRE>
+private void <B>restartRound</B>()</PRE>
+<DL>
+<DD>Restarts round after redealing
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="endOfRound(jrummikub.model.Score)"><!-- --></A><H3>
+endOfRound</H3>
+<PRE>
+private void <B>endOfRound</B>(<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&nbsp;roundScore)</PRE>
+<DL>
+<DD>Sets the score and default values for saving when round ends
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>roundScore</CODE> - score for ended round</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="showScorePanel()"><!-- --></A><H3>
+showScorePanel</H3>
+<PRE>
+private void <B>showScorePanel</B>()</PRE>
+<DL>
+<DD>Sets score panel visible
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="showWinPanel()"><!-- --></A><H3>
+showWinPanel</H3>
+<PRE>
+protected void <B>showWinPanel</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="endProgram()"><!-- --></A><H3>
+endProgram</H3>
+<PRE>
+private void <B>endProgram</B>()</PRE>
+<DL>
+<DD>Exits System without warnings if no game control is active
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
@@ -227,7 +677,7 @@ public void <B>startGame</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/GameControl.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -248,9 +698,9 @@ public void <B>startGame</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/control/ITurnTimer.html b/doc/jrummikub/control/ITurnTimer.html
index 70e6910..25cc840 100644
--- a/doc/jrummikub/control/ITurnTimer.html
+++ b/doc/jrummikub/control/ITurnTimer.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:56 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:54 CEST 2011 -->
<TITLE>
ITurnTimer
</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/control/GameControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/ITurnTimer.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="ITurnTimer.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -224,7 +224,7 @@ getTimeRunOutEvent</H3>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/ITurnTimer.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="ITurnTimer.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
diff --git a/doc/jrummikub/control/RoundControl.html b/doc/jrummikub/control/RoundControl.html
index b6a8501..4fce933 100644
--- a/doc/jrummikub/control/RoundControl.html
+++ b/doc/jrummikub/control/RoundControl.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Tue May 10 17:04:56 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:51:54 CEST 2011 -->
<TITLE>
RoundControl
</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/ITurnTimer.html" title="interface in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/control/TurnControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/RoundControl.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="RoundControl.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;<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>
@@ -95,6 +95,9 @@ Class RoundControl</H2>
java.lang.Object
<IMG SRC="../../resources/inherit.gif" ALT="extended by "><B>jrummikub.control.RoundControl</B>
</PRE>
+<DL>
+<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../jrummikub/control/network/NetworkRoundControl.html" title="class in jrummikub.control.network">NetworkRoundControl</A></DD>
+</DL>
<HR>
<DL>
<DT><PRE>public class <B>RoundControl</B><DT>extends java.lang.Object</DL>
@@ -108,7 +111,107 @@ Controller that manages a single round of rummikub
<HR>
<P>
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+
+<A NAME="nested_class_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>Nested Class Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control">RoundControl.InvalidTurnInfo</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Table, stone sets and type of an invalid turn to allow a user to track his
+ own errors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.InvalidTurnType.html" title="enum in jrummikub.control">RoundControl.InvalidTurnType</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Enum summarizing the different types of invalid turns to set the correct
+ panel message</TD>
+</TR>
+</TABLE>
+&nbsp;<!-- =========== 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>protected &nbsp;java.util.List&lt;<A HREF="../../jrummikub/util/Connection.html" title="interface in jrummikub.util">Connection</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#connections">connections</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/Score.html" title="class in jrummikub.model">Score</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#endOfRoundEvent">endOfRoundEvent</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/control/RoundControl.html#mayPause">mayPause</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/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#restartRoundEvent">restartRoundEvent</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>protected &nbsp;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#roundState">roundState</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/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#roundStateUpdateEvent">roundStateUpdateEvent</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/control/turn/ITurnControl.html" title="interface in jrummikub.control.turn">ITurnControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#turnControl">turnControl</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/view/IView.html" title="interface in jrummikub.view">IView</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#view">view</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>
@@ -118,11 +221,23 @@ Controller that manages a single round of rummikub
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#RoundControl(jrummikub.model.IGameState, jrummikub.view.IView)">RoundControl</A></B>(<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A>&nbsp;gameState,
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#RoundControl(jrummikub.model.IRoundState, jrummikub.view.IView)">RoundControl</A></B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState,
<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new RoundControl using the given gameState and view</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new RoundControl using the given roundState and view</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected </CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#RoundControl(jrummikub.model.IRoundState, jrummikub.view.IView, boolean)">RoundControl</A></B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState,
+ <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
+ boolean&nbsp;mayPause)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new RoundControl using the given roundState and view</TD>
</TR>
</TABLE>
&nbsp;
@@ -136,30 +251,153 @@ Controller that manages a single round of rummikub
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>(package private) &nbsp;void</CODE></FONT></TD>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#abortRound()">abortRound</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Abort round if a new one is started or a saved one is loaded</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><A HREF="../../jrummikub/control/RoundControl.html#addTurnControlListeners(jrummikub.control.turn.ITurnControl)">addTurnControlListeners</A></B>(<A HREF="../../jrummikub/control/turn/ITurnControl.html" title="interface in jrummikub.control.turn">ITurnControl</A>&nbsp;turnControl)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Override this</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/control/RoundControl.html#continueRound()">continueRound</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Continue a saved round after loading</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;<A HREF="../../jrummikub/control/turn/ITurnControl.html" title="interface in jrummikub.control.turn">ITurnControl</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#createTurnControl()">createTurnControl</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates new turn control of the specified type</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><A HREF="../../jrummikub/control/RoundControl.html#deal()">deal</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Deal each player the number of stones specified in the game settings
+ (numberOfStonesDealt)</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><A HREF="../../jrummikub/control/RoundControl.html#doPrepareTurn()">doPrepareTurn</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Prepare turn by setting the view components</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><A HREF="../../jrummikub/control/RoundControl.html#dealStone()">dealStone</A></B>()</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#endOfRound()">endOfRound</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Ends the current round and emits an event setting the score</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../jrummikub/util/IEvent.html" title="interface in jrummikub.util">IEvent</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#getEndRoundEvent()">getEndRoundEvent</A></B>()</CODE>
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#endOfTurn(jrummikub.control.RoundControl.InvalidTurnInfo)">endOfTurn</A></B>(<A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control">RoundControl.InvalidTurnInfo</A>&nbsp;invalidTurnInfo)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;End the players turn</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/Score.html" title="class in jrummikub.model">Score</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#getEndOfRoundEvent()">getEndOfRoundEvent</A></B>()</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;End the round</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/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#getRestartRoundEvent()">getRestartRoundEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Emitted when the round is aborted and needs to be restarted</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/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#getRoundStateUpdateEvent()">getRoundStateUpdateEvent</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Is emitted in network when a new turn starts</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><A HREF="../../jrummikub/control/RoundControl.html#nextPlayer()">nextPlayer</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Set the next player as active player if the round is not finished</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><A HREF="../../jrummikub/control/RoundControl.html#prepareTurn()">prepareTurn</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Prepare a player's turn by checking the player types and setting the
+ correct turn control</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><A HREF="../../jrummikub/control/RoundControl.html#redeal()">redeal</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Redeal stones and restart round if a player was allowed to redeal and chose
+ to do so</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/control/RoundControl.html#removeListeners()">removeListeners</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Removes all listeners form the connections</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>private &nbsp;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#score()">score</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculate the score for the current round and the total game score</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><A HREF="../../jrummikub/control/RoundControl.html#setRoundState(jrummikub.model.IRoundState)">setRoundState</A></B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;state)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the current round state</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;<A HREF="../../jrummikub/view/IView.BottomPanelType.html" title="enum in jrummikub.view">IView.BottomPanelType</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#showStartTurnPanel()">showStartTurnPanel</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;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#startRound()">startRound</A></B>()</CODE>
@@ -168,12 +406,30 @@ Controller that manages a single round of rummikub
</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><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>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#startTurn()">startTurn</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Start a players turn with the correct turn control</TD>
+</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.lang.Integer,java.lang.Integer&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/RoundControl.html#updateBestScore(jrummikub.util.Pair, int, int)">updateBestScore</A></B>(<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,java.lang.Integer&gt;&nbsp;bestScore,
+ int&nbsp;stonePoints,
+ int&nbsp;size)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Update the best score to find the winner in case of special game end
+ (everybody still has stones on hand)</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/control/RoundControl.html#updateSidePanel()">updateSidePanel</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Update the side panel to show correct player order and heap size</TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -188,6 +444,95 @@ Controller that manages a single round of rummikub
&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="turnControl"><!-- --></A><H3>
+turnControl</H3>
+<PRE>
+private <A HREF="../../jrummikub/control/turn/ITurnControl.html" title="interface in jrummikub.control.turn">ITurnControl</A> <B>turnControl</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="roundState"><!-- --></A><H3>
+roundState</H3>
+<PRE>
+protected <A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A> <B>roundState</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="view"><!-- --></A><H3>
+view</H3>
+<PRE>
+private <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A> <B>view</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="restartRoundEvent"><!-- --></A><H3>
+restartRoundEvent</H3>
+<PRE>
+private <A HREF="../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&gt; <B>restartRoundEvent</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="roundStateUpdateEvent"><!-- --></A><H3>
+roundStateUpdateEvent</H3>
+<PRE>
+private <A HREF="../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&gt; <B>roundStateUpdateEvent</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="endOfRoundEvent"><!-- --></A><H3>
+endOfRoundEvent</H3>
+<PRE>
+private <A HREF="../../jrummikub/util/Event1.html" title="class in jrummikub.util">Event1</A>&lt;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&gt; <B>endOfRoundEvent</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="connections"><!-- --></A><H3>
+connections</H3>
+<PRE>
+protected java.util.List&lt;<A HREF="../../jrummikub/util/Connection.html" title="interface in jrummikub.util">Connection</A>&gt; <B>connections</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="mayPause"><!-- --></A><H3>
+mayPause</H3>
+<PRE>
+private boolean <B>mayPause</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -198,16 +543,30 @@ Controller that manages a single round of rummikub
</TR>
</TABLE>
-<A NAME="RoundControl(jrummikub.model.IGameState, jrummikub.view.IView)"><!-- --></A><H3>
+<A NAME="RoundControl(jrummikub.model.IRoundState, jrummikub.view.IView)"><!-- --></A><H3>
RoundControl</H3>
<PRE>
-public <B>RoundControl</B>(<A HREF="../../jrummikub/model/IGameState.html" title="interface in jrummikub.model">IGameState</A>&nbsp;gameState,
+public <B>RoundControl</B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState,
<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</PRE>
<DL>
-<DD>Create a new RoundControl using the given gameState and view
+<DD>Create a new RoundControl using the given roundState and view
+<P>
+<DL>
+<DT><B>Parameters:</B><DD><CODE>roundState</CODE> - initial round state<DD><CODE>view</CODE> - view used for user interaction</DL>
+</DL>
+<HR>
+
+<A NAME="RoundControl(jrummikub.model.IRoundState, jrummikub.view.IView, boolean)"><!-- --></A><H3>
+RoundControl</H3>
+<PRE>
+protected <B>RoundControl</B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;roundState,
+ <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
+ boolean&nbsp;mayPause)</PRE>
+<DL>
+<DD>Create a new RoundControl using the given roundState and view
<P>
<DL>
-<DT><B>Parameters:</B><DD><CODE>gameState</CODE> - initial game state<DD><CODE>view</CODE> - view used for user interaction</DL>
+<DT><B>Parameters:</B><DD><CODE>roundState</CODE> - initial round state<DD><CODE>view</CODE> - view used for user interaction<DD><CODE>mayPause</CODE> - true when players are allowed to pause</DL>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -220,16 +579,30 @@ public <B>RoundControl</B>(<A HREF="../../jrummikub/model/IGameState.html" title
</TR>
</TABLE>
-<A NAME="getEndRoundEvent()"><!-- --></A><H3>
-getEndRoundEvent</H3>
+<A NAME="getRoundStateUpdateEvent()"><!-- --></A><H3>
+getRoundStateUpdateEvent</H3>
+<PRE>
+public <A HREF="../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&gt; <B>getRoundStateUpdateEvent</B>()</PRE>
+<DL>
+<DD>Is emitted in network when a new turn starts
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the event</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getEndOfRoundEvent()"><!-- --></A><H3>
+getEndOfRoundEvent</H3>
<PRE>
-public <A HREF="../../jrummikub/util/IEvent.html" title="interface in jrummikub.util">IEvent</A> <B>getEndRoundEvent</B>()</PRE>
+public <A HREF="../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A>&gt; <B>getEndOfRoundEvent</B>()</PRE>
<DL>
<DD>End the round
<P>
<DD><DL>
-<DT><B>Returns:</B><DD>endRoundEvent</DL>
+<DT><B>Returns:</B><DD>endOfRoundEvent</DL>
</DD>
</DL>
<HR>
@@ -247,34 +620,255 @@ public void <B>startRound</B>()</PRE>
</DL>
<HR>
+<A NAME="continueRound()"><!-- --></A><H3>
+continueRound</H3>
+<PRE>
+public void <B>continueRound</B>()</PRE>
+<DL>
+<DD>Continue a saved round after loading
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="abortRound()"><!-- --></A><H3>
+abortRound</H3>
+<PRE>
+public void <B>abortRound</B>()</PRE>
+<DL>
+<DD>Abort round if a new one is started or a saved one is loaded
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setRoundState(jrummikub.model.IRoundState)"><!-- --></A><H3>
+setRoundState</H3>
+<PRE>
+protected void <B>setRoundState</B>(<A HREF="../../jrummikub/model/IRoundState.html" title="interface in jrummikub.model">IRoundState</A>&nbsp;state)</PRE>
+<DL>
+<DD>Sets the current round state
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>state</CODE> - to be set</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="showStartTurnPanel()"><!-- --></A><H3>
+showStartTurnPanel</H3>
+<PRE>
+protected <A HREF="../../jrummikub/view/IView.BottomPanelType.html" title="enum in jrummikub.view">IView.BottomPanelType</A> <B>showStartTurnPanel</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="prepareTurn()"><!-- --></A><H3>
+prepareTurn</H3>
+<PRE>
+protected void <B>prepareTurn</B>()</PRE>
+<DL>
+<DD>Prepare a player's turn by checking the player types and setting the
+ correct turn control
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="doPrepareTurn()"><!-- --></A><H3>
+doPrepareTurn</H3>
+<PRE>
+protected void <B>doPrepareTurn</B>()</PRE>
+<DL>
+<DD>Prepare turn by setting the view components
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="startTurn()"><!-- --></A><H3>
+startTurn</H3>
+<PRE>
+protected void <B>startTurn</B>()</PRE>
+<DL>
+<DD>Start a players turn with the correct turn control
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="updateSidePanel()"><!-- --></A><H3>
+updateSidePanel</H3>
+<PRE>
+private void <B>updateSidePanel</B>()</PRE>
+<DL>
+<DD>Update the side panel to show correct player order and heap size
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="addTurnControlListeners(jrummikub.control.turn.ITurnControl)"><!-- --></A><H3>
+addTurnControlListeners</H3>
+<PRE>
+protected void <B>addTurnControlListeners</B>(<A HREF="../../jrummikub/control/turn/ITurnControl.html" title="interface in jrummikub.control.turn">ITurnControl</A>&nbsp;turnControl)</PRE>
+<DL>
+<DD>Override this
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>turnControl</CODE> - current turn control</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="createTurnControl()"><!-- --></A><H3>
+createTurnControl</H3>
+<PRE>
+protected <A HREF="../../jrummikub/control/turn/ITurnControl.html" title="interface in jrummikub.control.turn">ITurnControl</A> <B>createTurnControl</B>()</PRE>
+<DL>
+<DD>Creates new turn control of the specified type
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the new turn control</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="deal()"><!-- --></A><H3>
deal</H3>
<PRE>
-void <B>deal</B>()</PRE>
+protected void <B>deal</B>()</PRE>
<DL>
+<DD>Deal each player the number of stones specified in the game settings
+ (numberOfStonesDealt)
+<P>
<DD><DL>
</DL>
</DD>
</DL>
<HR>
-<A NAME="tableDifference(jrummikub.model.ITable, jrummikub.model.ITable)"><!-- --></A><H3>
-tableDifference</H3>
+<A NAME="endOfTurn(jrummikub.control.RoundControl.InvalidTurnInfo)"><!-- --></A><H3>
+endOfTurn</H3>
<PRE>
-static java.util.Set&lt;<A HREF="../../jrummikub/model/Stone.html" title="class in jrummikub.model">Stone</A>&gt; <B>tableDifference</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)</PRE>
+protected void <B>endOfTurn</B>(<A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control">RoundControl.InvalidTurnInfo</A>&nbsp;invalidTurnInfo)</PRE>
<DL>
+<DD>End the players turn
+<P>
<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>invalidTurnInfo</CODE> - info about the player's last turn</DL>
+</DD>
</DL>
+<HR>
+
+<A NAME="nextPlayer()"><!-- --></A><H3>
+nextPlayer</H3>
+<PRE>
+protected void <B>nextPlayer</B>()</PRE>
+<DL>
+<DD>Set the next player as active player if the round is not finished
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="endOfRound()"><!-- --></A><H3>
+endOfRound</H3>
+<PRE>
+void <B>endOfRound</B>()</PRE>
+<DL>
+<DD>Ends the current round and emits an event setting the score
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="removeListeners()"><!-- --></A><H3>
+removeListeners</H3>
+<PRE>
+private void <B>removeListeners</B>()</PRE>
+<DL>
+<DD>Removes all listeners form the connections
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="score()"><!-- --></A><H3>
+score</H3>
+<PRE>
+private <A HREF="../../jrummikub/model/Score.html" title="class in jrummikub.model">Score</A> <B>score</B>()</PRE>
+<DL>
+<DD>Calculate the score for the current round and the total game score
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the new score</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="updateBestScore(jrummikub.util.Pair, int, int)"><!-- --></A><H3>
+updateBestScore</H3>
+<PRE>
+private static <A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,java.lang.Integer&gt; <B>updateBestScore</B>(<A HREF="../../jrummikub/util/Pair.html" title="class in jrummikub.util">Pair</A>&lt;java.lang.Integer,java.lang.Integer&gt;&nbsp;bestScore,
+ int&nbsp;stonePoints,
+ int&nbsp;size)</PRE>
+<DL>
+<DD>Update the best score to find the winner in case of special game end
+ (everybody still has stones on hand)
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>bestScore</CODE> - of previous rounds<DD><CODE>stonePoints</CODE> - sum of points still left on hands<DD><CODE>size</CODE> - number of players in game (= size of score list in columns)
+<DT><B>Returns:</B><DD>Pair of maximum points and hand size</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getRestartRoundEvent()"><!-- --></A><H3>
+getRestartRoundEvent</H3>
+<PRE>
+public <A HREF="../../jrummikub/util/IEvent1.html" title="interface in jrummikub.util">IEvent1</A>&lt;<A HREF="../../jrummikub/model/PlayerSettings.html" title="class in jrummikub.model">PlayerSettings</A>&gt; <B>getRestartRoundEvent</B>()</PRE>
+<DL>
+<DD>Emitted when the round is aborted and needs to be restarted
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>the event</DL>
</DD>
</DL>
<HR>
-<A NAME="dealStone()"><!-- --></A><H3>
-dealStone</H3>
+<A NAME="redeal()"><!-- --></A><H3>
+redeal</H3>
<PRE>
-void <B>dealStone</B>()</PRE>
+protected void <B>redeal</B>()</PRE>
<DL>
+<DD>Redeal stones and restart round if a player was allowed to redeal and chose
+ to do so
+<P>
<DD><DL>
</DL>
</DD>
@@ -310,8 +904,8 @@ void <B>dealStone</B>()</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/control/TurnControl.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/RoundControl.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="RoundControl.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -331,9 +925,9 @@ void <B>dealStone</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;<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/control/TurnTimer.html b/doc/jrummikub/control/TurnTimer.html
index 42bd298..f65eb7d 100644
--- a/doc/jrummikub/control/TurnTimer.html
+++ b/doc/jrummikub/control/TurnTimer.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:54 CEST 2011 -->
<TITLE>
TurnTimer
</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/control/TurnControl.HandStonePositionComparator.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/SettingsControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
&nbsp;NEXT CLASS</FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/TurnTimer.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>
@@ -111,7 +111,56 @@ Count-down timer used to limit the turn time
<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/control/TurnTimer.html#timeLeft">timeLeft</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;javax.swing.Timer</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/TurnTimer.html#timer">timer</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/Event.html" title="class in jrummikub.util">Event</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/TurnTimer.html#timeRunOutEvent">timeRunOutEvent</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/control/TurnTimer.html#totalTime">totalTime</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/view/IView.html" title="interface in jrummikub.view">IView</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../jrummikub/control/TurnTimer.html#view">view</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,7 +170,8 @@ Count-down timer used to limit the turn time
<B>Constructor Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../jrummikub/control/TurnTimer.html#TurnTimer(jrummikub.view.IView)">TurnTimer</A></B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</CODE>
+<TD><CODE><B><A HREF="../../jrummikub/control/TurnTimer.html#TurnTimer(jrummikub.view.IView, int)">TurnTimer</A></B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
+ int&nbsp;totalTime)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a new timer using a given view to display the current time left</TD>
@@ -181,6 +231,65 @@ Count-down timer used to limit the turn time
&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="view"><!-- --></A><H3>
+view</H3>
+<PRE>
+private <A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A> <B>view</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="timeLeft"><!-- --></A><H3>
+timeLeft</H3>
+<PRE>
+private int <B>timeLeft</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="totalTime"><!-- --></A><H3>
+totalTime</H3>
+<PRE>
+private int <B>totalTime</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="timer"><!-- --></A><H3>
+timer</H3>
+<PRE>
+private javax.swing.Timer <B>timer</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="timeRunOutEvent"><!-- --></A><H3>
+timeRunOutEvent</H3>
+<PRE>
+private <A HREF="../../jrummikub/util/Event.html" title="class in jrummikub.util">Event</A> <B>timeRunOutEvent</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<A NAME="constructor_detail"><!-- --></A>
@@ -191,15 +300,16 @@ Count-down timer used to limit the turn time
</TR>
</TABLE>
-<A NAME="TurnTimer(jrummikub.view.IView)"><!-- --></A><H3>
+<A NAME="TurnTimer(jrummikub.view.IView, int)"><!-- --></A><H3>
TurnTimer</H3>
<PRE>
-public <B>TurnTimer</B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view)</PRE>
+public <B>TurnTimer</B>(<A HREF="../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
+ int&nbsp;totalTime)</PRE>
<DL>
<DD>Create a new timer using a given view to display the current time left
<P>
<DL>
-<DT><B>Parameters:</B><DD><CODE>view</CODE> - view to display</DL>
+<DT><B>Parameters:</B><DD><CODE>view</CODE> - view to display<DD><CODE>totalTime</CODE> - total time for turn</DL>
</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -307,7 +417,7 @@ public <A HREF="../../jrummikub/util/IEvent.html" title="interface in jrummikub.
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/control/TurnControl.HandStonePositionComparator.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/SettingsControl.html" title="class in jrummikub.control"><B>PREV CLASS</B></A>&nbsp;
&nbsp;NEXT CLASS</FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/TurnTimer.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -328,9 +438,9 @@ public <A HREF="../../jrummikub/util/IEvent.html" title="interface 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/control/class-use/ApplicationControl.html b/doc/jrummikub/control/class-use/ApplicationControl.html
index 66a799a..1ff6a66 100644
--- a/doc/jrummikub/control/class-use/ApplicationControl.html
+++ b/doc/jrummikub/control/class-use/ApplicationControl.html
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_22) on Wed Jun 22 11:34:50 CEST 2011 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Tue Jul 05 21:52:00 CEST 2011 -->
<TITLE>
Uses of Class jrummikub.control.ApplicationControl
</TITLE>
-<META NAME="date" CONTENT="2011-06-22">
+<META NAME="date" CONTENT="2011-07-05">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
@@ -37,7 +37,8 @@ function windowTitle()
<A NAME="navbar_top_firstrow"><!-- --></A>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
<TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../jrummikub/control/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
@@ -82,7 +83,58 @@ function windowTitle()
<H2>
<B>Uses of Class<br>jrummikub.control.ApplicationControl</B></H2>
</CENTER>
-No usage of jrummikub.control.ApplicationControl
+
+<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/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</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>
+</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/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</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/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</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/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</A></CODE></FONT></TD>
+<TD><CODE><B>LoginControl.</B><B><A HREF="../../../jrummikub/control/LoginControl.html#appControl">appControl</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/control/package-summary.html">jrummikub.control</A> with parameters of type <A HREF="../../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../jrummikub/control/LoginControl.html#LoginControl(jrummikub.view.IView, jrummikub.control.ApplicationControl)">LoginControl</A></B>(<A HREF="../../../jrummikub/view/IView.html" title="interface in jrummikub.view">IView</A>&nbsp;view,
+ <A HREF="../../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</A>&nbsp;applicationControl)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for login Control</TD>
+</TR>
+</TABLE>
+&nbsp;
<P>
<HR>
@@ -96,7 +148,8 @@ No usage of jrummikub.control.ApplicationControl
<A NAME="navbar_bottom_firstrow"><!-- --></A>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
<TR ALIGN="center" VALIGN="top">
- <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../jrummikub/control/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
<TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
<TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
diff --git a/doc/jrummikub/control/class-use/GameControl.html b/doc/jrummikub/control/class-use/GameControl.html
index ddc8911..15980ba 100644
--- a/doc/jrummikub/control/class-use/GameControl.html
+++ b/doc/jrummikub/control/class-use/GameControl.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.control.GameControl
</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,88 @@ function windowTitle()
<H2>
<B>Uses of Class<br>jrummikub.control.GameControl</B></H2>
</CENTER>
-No usage of jrummikub.control.GameControl
+
+<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/control/GameControl.html" title="class in jrummikub.control">GameControl</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.control.network"><B>jrummikub.control.network</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/control/GameControl.html" title="class in jrummikub.control">GameControl</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/control/GameControl.html" title="class in jrummikub.control">GameControl</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/control/GameControl.html" title="class in jrummikub.control">GameControl</A></CODE></FONT></TD>
+<TD><CODE><B>ApplicationControl.</B><B><A HREF="../../../jrummikub/control/ApplicationControl.html#gameControl">gameControl</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> with parameters of type <A HREF="../../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</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>ApplicationControl.</B><B><A HREF="../../../jrummikub/control/ApplicationControl.html#addGameControlListeners(jrummikub.control.GameControl)">addGameControlListeners</A></B>(<A HREF="../../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</A>&nbsp;gameControl)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds events listeners to game control events</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/control/GameControl.html" title="class in jrummikub.control">GameControl</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">Subclasses of <A HREF="../../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</A> in <A HREF="../../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../jrummikub/control/network/NetworkGameControl.html" title="class in jrummikub.control.network">NetworkGameControl</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Class controlling network games</TD>
+</TR>
+</TABLE>
+&nbsp;
<P>
<HR>
diff --git a/doc/jrummikub/control/class-use/ITurnTimer.html b/doc/jrummikub/control/class-use/ITurnTimer.html
index bf6b79f..296fb37 100644
--- a/doc/jrummikub/control/class-use/ITurnTimer.html
+++ b/doc/jrummikub/control/class-use/ITurnTimer.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.control.ITurnTimer
</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,10 @@ Packages that use <A HREF="../../../jrummikub/control/ITurnTimer.html" title="in
<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>
</TABLE>
&nbsp;
<P>
@@ -121,16 +125,38 @@ Uses of <A HREF="../../../jrummikub/control/ITurnTimer.html" title="interface in
</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/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</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/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</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/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A></CODE></FONT></TD>
+<TD><CODE><B>AbstractTurnControl.</B><B><A HREF="../../../jrummikub/control/turn/AbstractTurnControl.html#timer">timer</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/control/package-summary.html">jrummikub.control</A> with parameters of type <A HREF="../../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A></FONT></TH>
+<TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../jrummikub/control/turn/package-summary.html">jrummikub.control.turn</A> with parameters of type <A HREF="../../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</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, 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><CODE><B><A HREF="../../../jrummikub/control/turn/HumanTurnControl.html#HumanTurnControl(jrummikub.control.ITurnTimer)">HumanTurnControl</A></B>(<A HREF="../../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A>&nbsp;testTimer)</CODE>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Test only constructor</TD>
diff --git a/doc/jrummikub/control/class-use/RoundControl.html b/doc/jrummikub/control/class-use/RoundControl.html
index eb8d850..ff58ab9 100644
--- a/doc/jrummikub/control/class-use/RoundControl.html
+++ b/doc/jrummikub/control/class-use/RoundControl.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.control.RoundControl
</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,104 @@ function windowTitle()
<H2>
<B>Uses of Class<br>jrummikub.control.RoundControl</B></H2>
</CENTER>
-No usage of jrummikub.control.RoundControl
+
+<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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</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.control.network"><B>jrummikub.control.network</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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A></CODE></FONT></TD>
+<TD><CODE><B>GameControl.</B><B><A HREF="../../../jrummikub/control/GameControl.html#roundControl">roundControl</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 <A HREF="../../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A></CODE></FONT></TD>
+<TD><CODE><B>GameControl.</B><B><A HREF="../../../jrummikub/control/GameControl.html#createRoundControl(jrummikub.model.IRoundState)">createRoundControl</A></B>(<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;Creates a new round control with the specified round state</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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</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">Subclasses of <A HREF="../../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A> in <A HREF="../../../jrummikub/control/network/package-summary.html">jrummikub.control.network</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../jrummikub/control/network/NetworkRoundControl.html" title="class in jrummikub.control.network">NetworkRoundControl</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Round control for network games</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 <A HREF="../../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</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/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A></CODE></FONT></TD>
+<TD><CODE><B>NetworkGameControl.</B><B><A HREF="../../../jrummikub/control/network/NetworkGameControl.html#createRoundControl(jrummikub.model.IRoundState)">createRoundControl</A></B>(<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;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
<P>
<HR>
diff --git a/doc/jrummikub/control/class-use/TurnTimer.html b/doc/jrummikub/control/class-use/TurnTimer.html
index 16b27db..fec7a3a 100644
--- a/doc/jrummikub/control/class-use/TurnTimer.html
+++ b/doc/jrummikub/control/class-use/TurnTimer.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 Class jrummikub.control.TurnTimer
</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/control/package-frame.html b/doc/jrummikub/control/package-frame.html
index 002929f..f230cef 100644
--- a/doc/jrummikub/control/package-frame.html
+++ b/doc/jrummikub/control/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.control
</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">
@@ -34,18 +34,37 @@ Interfaces</FONT>&nbsp;
Classes</FONT>&nbsp;
<FONT CLASS="FrameItemFont">
<BR>
+<A HREF="AbstractSettingsControl.html" title="class in jrummikub.control" target="classFrame">AbstractSettingsControl</A>
+<BR>
+<A HREF="ApplicationControl.html" title="class in jrummikub.control" target="classFrame">ApplicationControl</A>
+<BR>
<A HREF="GameControl.html" title="class in jrummikub.control" target="classFrame">GameControl</A>
<BR>
+<A HREF="LoginControl.html" title="class in jrummikub.control" target="classFrame">LoginControl</A>
+<BR>
<A HREF="RoundControl.html" title="class in jrummikub.control" target="classFrame">RoundControl</A>
<BR>
-<A HREF="TurnControl.html" title="class in jrummikub.control" target="classFrame">TurnControl</A>
+<A HREF="RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control" target="classFrame">RoundControl.InvalidTurnInfo</A>
+<BR>
+<A HREF="SaveControl.html" title="class in jrummikub.control" target="classFrame">SaveControl</A>
<BR>
-<A HREF="TurnControl.HandStonePositionComparator.html" title="class in jrummikub.control" target="classFrame">TurnControl.HandStonePositionComparator</A>
+<A HREF="SettingsControl.html" title="class in jrummikub.control" target="classFrame">SettingsControl</A>
<BR>
<A HREF="TurnTimer.html" title="class in jrummikub.control" target="classFrame">TurnTimer</A></FONT></TD>
</TR>
</TABLE>
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Enums</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="RoundControl.InvalidTurnType.html" title="enum in jrummikub.control" target="classFrame">RoundControl.InvalidTurnType</A></FONT></TD>
+</TR>
+</TABLE>
+
+
</BODY>
</HTML>
diff --git a/doc/jrummikub/control/package-summary.html b/doc/jrummikub/control/package-summary.html
index 1091c76..ca6f66d 100644
--- a/doc/jrummikub/control/package-summary.html
+++ b/doc/jrummikub/control/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.control
</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/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/ai/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/network/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/package-summary.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -103,20 +103,39 @@ Package jrummikub.control
<B>Class Summary</B></FONT></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/AbstractSettingsControl.html" title="class in jrummikub.control">AbstractSettingsControl</A></B></TD>
+<TD>Abstract control class managing joined methods and attributes of all
+ different (network, default...) settings controls</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control">ApplicationControl</A></B></TD>
+<TD>The application control controls the settings for a new games and create the
+ game control</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control">GameControl</A></B></TD>
<TD>Controls a Game, at some point including all Rounds, starts new Rounds</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control">LoginControl</A></B></TD>
+<TD>Control checking and processing login data for network game</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control">RoundControl</A></B></TD>
<TD>Controller that manages a single round of rummikub</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/TurnControl.html" title="class in jrummikub.control">TurnControl</A></B></TD>
-<TD>Controller for a single turn made by a human player</TD>
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control">RoundControl.InvalidTurnInfo</A></B></TD>
+<TD>Table, stone sets and type of an invalid turn to allow a user to track his
+ own errors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control">SaveControl</A></B></TD>
+<TD>The save control is responsible for loading and saving game and round states</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/TurnControl.HandStonePositionComparator.html" title="class in jrummikub.control">TurnControl.HandStonePositionComparator</A></B></TD>
-<TD>&nbsp;</TD>
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/SettingsControl.html" title="class in jrummikub.control">SettingsControl</A></B></TD>
+<TD>The settings control controls the settings panel</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/TurnTimer.html" title="class in jrummikub.control">TurnTimer</A></B></TD>
@@ -126,6 +145,21 @@ Package jrummikub.control
&nbsp;
<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Enum Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../jrummikub/control/RoundControl.InvalidTurnType.html" title="enum in jrummikub.control">RoundControl.InvalidTurnType</A></B></TD>
+<TD>Enum summarizing the different types of invalid turns to set the correct
+ panel message</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
<DL>
</DL>
<HR>
@@ -158,8 +192,8 @@ Package jrummikub.control
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/ai/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/network/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/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/control/package-tree.html b/doc/jrummikub/control/package-tree.html
index 59c2f2a..b89ea75 100644
--- a/doc/jrummikub/control/package-tree.html
+++ b/doc/jrummikub/control/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.control 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/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/ai/package-tree.html"><B>PREV</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/network/package-tree.html"><B>NEXT</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/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,8 +92,10 @@ Class Hierarchy
</H2>
<UL>
<LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control"><B>GameControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control"><B>RoundControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/TurnControl.html" title="class in jrummikub.control"><B>TurnControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/TurnControl.HandStonePositionComparator.html" title="class in jrummikub.control"><B>TurnControl.HandStonePositionComparator</B></A> (implements java.util.Comparator&lt;T&gt;)
-<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/TurnTimer.html" title="class in jrummikub.control"><B>TurnTimer</B></A> (implements java.awt.event.ActionListener, jrummikub.control.<A HREF="../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A>)
+<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/AbstractSettingsControl.html" title="class in jrummikub.control"><B>AbstractSettingsControl</B></A><UL>
+<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/SettingsControl.html" title="class in jrummikub.control"><B>SettingsControl</B></A></UL>
+<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/ApplicationControl.html" title="class in jrummikub.control"><B>ApplicationControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/GameControl.html" title="class in jrummikub.control"><B>GameControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/LoginControl.html" title="class in jrummikub.control"><B>LoginControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/RoundControl.html" title="class in jrummikub.control"><B>RoundControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/RoundControl.InvalidTurnInfo.html" title="class in jrummikub.control"><B>RoundControl.InvalidTurnInfo</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/SaveControl.html" title="class in jrummikub.control"><B>SaveControl</B></A><LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/TurnTimer.html" title="class in jrummikub.control"><B>TurnTimer</B></A> (implements java.awt.event.ActionListener, jrummikub.control.<A HREF="../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control">ITurnTimer</A>)
</UL>
</UL>
<H2>
@@ -101,6 +103,16 @@ Interface Hierarchy
</H2>
<UL>
<LI TYPE="circle">jrummikub.control.<A HREF="../../jrummikub/control/ITurnTimer.html" title="interface in jrummikub.control"><B>ITurnTimer</B></A></UL>
+<H2>
+Enum Hierarchy
+</H2>
+<UL>
+<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.control.<A HREF="../../jrummikub/control/RoundControl.InvalidTurnType.html" title="enum in jrummikub.control"><B>RoundControl.InvalidTurnType</B></A></UL>
+</UL>
+</UL>
<HR>
@@ -131,8 +143,8 @@ Interface Hierarchy
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../jrummikub/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../jrummikub/model/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../jrummikub/ai/package-tree.html"><B>PREV</B></A>&nbsp;
+&nbsp;<A HREF="../../jrummikub/control/network/package-tree.html"><B>NEXT</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../index.html?jrummikub/control/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/control/package-use.html b/doc/jrummikub/control/package-use.html
index 39dddbe..924169b 100644
--- a/doc/jrummikub/control/package-use.html
+++ b/doc/jrummikub/control/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.control
</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/control/package-summary.html">jrummik
<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>
</TABLE>
&nbsp;
<P>
@@ -103,11 +111,132 @@ Packages that use <A HREF="../../jrummikub/control/package-summary.html">jrummik
Classes in <A HREF="../../jrummikub/control/package-summary.html">jrummikub.control</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/control/class-use/AbstractSettingsControl.html#jrummikub.control"><B>AbstractSettingsControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Abstract control class managing joined methods and attributes of all
+ different (network, default...) settings controls</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/ApplicationControl.html#jrummikub.control"><B>ApplicationControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The application control controls the settings for a new games and create the
+ game control</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/GameControl.html#jrummikub.control"><B>GameControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Controls a Game, at some point including all Rounds, starts new Rounds</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../jrummikub/control/class-use/ITurnTimer.html#jrummikub.control"><B>ITurnTimer</B></A></B>
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/control/TurnTimer.html" title="class in jrummikub.control"><CODE>TurnTimer</CODE></A></TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/LoginControl.html#jrummikub.control"><B>LoginControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Control checking and processing login data for network game</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/RoundControl.html#jrummikub.control"><B>RoundControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Controller that manages a single round of rummikub</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/RoundControl.InvalidTurnInfo.html#jrummikub.control"><B>RoundControl.InvalidTurnInfo</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Table, stone sets and type of an invalid turn to allow a user to track his
+ own errors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/RoundControl.InvalidTurnType.html#jrummikub.control"><B>RoundControl.InvalidTurnType</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Enum summarizing the different types of invalid turns to set the correct
+ panel message</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/SaveControl.html#jrummikub.control"><B>SaveControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The save control is responsible for loading and saving game and round states</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/SettingsControl.html#jrummikub.control"><B>SettingsControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The settings control controls the settings panel</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/control/package-summary.html">jrummikub.control</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/control/class-use/AbstractSettingsControl.html#jrummikub.control.network"><B>AbstractSettingsControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Abstract control class managing joined methods and attributes of all
+ different (network, default...) settings controls</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/GameControl.html#jrummikub.control.network"><B>GameControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Controls a Game, at some point including all Rounds, starts new Rounds</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/RoundControl.html#jrummikub.control.network"><B>RoundControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Controller that manages a single round of rummikub</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/RoundControl.InvalidTurnInfo.html#jrummikub.control.network"><B>RoundControl.InvalidTurnInfo</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Table, stone sets and type of an invalid turn to allow a user to track his
+ own errors</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/SaveControl.html#jrummikub.control.network"><B>SaveControl</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The save control is responsible for loading and saving game and round states</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/control/package-summary.html">jrummikub.control</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/control/class-use/ITurnTimer.html#jrummikub.control.turn"><B>ITurnTimer</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Interface for the <A HREF="../../jrummikub/control/TurnTimer.html" title="class in jrummikub.control"><CODE>TurnTimer</CODE></A></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../jrummikub/control/class-use/RoundControl.InvalidTurnInfo.html#jrummikub.control.turn"><B>RoundControl.InvalidTurnInfo</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Table, stone sets and type of an invalid turn to allow a user to track his
+ own errors</TD>
+</TR>
</TABLE>
&nbsp;
<P>