From 51b7fbe822bd9a3804c061f0b844884769d7ddba Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Wed, 6 Jul 2011 16:36:06 +0200 Subject: Javadoc git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@609 72836036-5685-4462-b002-a69064685172 --- doc/jrummikub/model/GameState.html | 255 ++++++++----- doc/jrummikub/model/Hand.html | 233 +++++++++++- doc/jrummikub/model/IHand.html | 156 +++++++- doc/jrummikub/model/IPlayer.html | 206 +++++++++-- doc/jrummikub/model/IStoneTray.html | 37 +- doc/jrummikub/model/ITable.html | 8 +- doc/jrummikub/model/Player.html | 354 ++++++++++++++++-- doc/jrummikub/model/Position.html | 123 +++++-- doc/jrummikub/model/Sizeable.html | 8 +- doc/jrummikub/model/Stone.html | 111 +++++- doc/jrummikub/model/StoneColor.html | 68 +++- doc/jrummikub/model/StoneHeap.html | 71 +++- doc/jrummikub/model/StoneSet.Type.html | 4 +- doc/jrummikub/model/StoneSet.html | 175 +++++++-- doc/jrummikub/model/StoneTray.Direction.html | 4 +- doc/jrummikub/model/StoneTray.html | 258 ++++++++++++- doc/jrummikub/model/Table.html | 142 +++++++- doc/jrummikub/model/class-use/GameState.html | 175 ++++++++- doc/jrummikub/model/class-use/Hand.html | 4 +- doc/jrummikub/model/class-use/IHand.html | 100 +++++- doc/jrummikub/model/class-use/IPlayer.html | 192 +++++++++- doc/jrummikub/model/class-use/IStoneTray.html | 4 +- doc/jrummikub/model/class-use/ITable.html | 273 ++++++++++++-- doc/jrummikub/model/class-use/Player.html | 42 ++- doc/jrummikub/model/class-use/Position.html | 286 +++++++++++++-- doc/jrummikub/model/class-use/Sizeable.html | 4 +- doc/jrummikub/model/class-use/Stone.html | 398 +++++++++++++++++++-- doc/jrummikub/model/class-use/StoneColor.html | 297 ++++++++++++++- doc/jrummikub/model/class-use/StoneHeap.html | 28 +- doc/jrummikub/model/class-use/StoneSet.Type.html | 39 +- doc/jrummikub/model/class-use/StoneSet.html | 331 ++++++++++++++++- .../model/class-use/StoneTray.Direction.html | 47 ++- doc/jrummikub/model/class-use/StoneTray.html | 4 +- doc/jrummikub/model/class-use/Table.html | 4 +- doc/jrummikub/model/package-frame.html | 22 +- doc/jrummikub/model/package-summary.html | 46 ++- doc/jrummikub/model/package-tree.html | 39 +- doc/jrummikub/model/package-use.html | 306 +++++++++++++++- 38 files changed, 4398 insertions(+), 456 deletions(-) (limited to 'doc/jrummikub/model') diff --git a/doc/jrummikub/model/GameState.html b/doc/jrummikub/model/GameState.html index b99ddf5..4a9e6ae 100644 --- a/doc/jrummikub/model/GameState.html +++ b/doc/jrummikub/model/GameState.html @@ -2,12 +2,12 @@ - + GameState - + @@ -55,7 +55,7 @@ function windowTitle() - PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -76,9 +76,9 @@ function windowTitle() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD @@ -96,22 +96,65 @@ java.lang.Object extended by jrummikub.model.GameState
-
All Implemented Interfaces:
IGameState
+
All Implemented Interfaces:
java.io.Serializable

-
public class GameState
extends java.lang.Object
implements IGameState
+
public class GameState
extends java.lang.Object
implements java.io.Serializable

-Class managing the overall and momentary GameState +Class that stores information for a game of multiple rounds

+

+
See Also:
Serialized Form

+ + + + + + + + + + + + + + + + + + + + + + + +
+Field Summary
+private  intfirstRoundFirstPlayer + +
+           
+private  PlayerSettingslastPlayerRedealed + +
+           
+private  java.util.ArrayList<Score>scores + +
+           
+private static longserialVersionUID +
+           
@@ -124,7 +167,7 @@ Class managing the overall and momentary GameState GameState()
-          Create a new GameState with an empty table and (currently) 4 new players. +              @@ -138,59 +181,60 @@ Class managing the overall and momentary GameState - IPlayer -getActivePlayer() + Score +getAccumulatedScore()
-          Returns the currently active player +          Calculated the accumulated score over the played rounds - StoneHeap -getGameHeap() + int +getFirstRoundFirstPlayer()
-          Returns the heap of stones to draw from +          Gets the number of the first player of the first round - IPlayer -getNthNextPlayer(int i) + PlayerSettings +getLastPlayerRedealed()
-          Returns the player that would be the active player after i turns +          Returns the player that has redealed last - int -getPlayerCount() + java.util.List<Score> +getScores()
-          Returns the number of players +          Returns the list of players' scores in the rounds played before - ITable -getTable() +private  java.lang.Boolean[] +getWinners(java.lang.Integer[] points, + int[] wins)
-          Get the current Table +          Returns whether players have won  void -nextPlayer() +setFirstRoundFirstPlayer(int firstRoundFirstPlayer)
-          Changes the activePlayer to the next Player in the list +          Sets the number of the first player of the first round  void -setTable(ITable table) +setLastPlayerRedealed(PlayerSettings lastPlayerRedealed)
-          Sets the current Table +          Sets the player that has redealed last   @@ -205,6 +249,55 @@ Class managing the overall and momentary GameState  

+ + + + + + + +
+Field Detail
+ +

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+ +

+firstRoundFirstPlayer

+
+private int firstRoundFirstPlayer
+
+
+
+
+
+ +

+scores

+
+private java.util.ArrayList<Score> scores
+
+
+
+
+
+ +

+lastPlayerRedealed

+
+private PlayerSettings lastPlayerRedealed
+
+
+
+
+ @@ -220,8 +313,6 @@ GameState
 public GameState()
-
Create a new GameState with an empty table and (currently) 4 new players. -

@@ -234,126 +325,120 @@ public GameState() -

-getTable

+

+getFirstRoundFirstPlayer

-public ITable getTable()
+public int getFirstRoundFirstPlayer()
-
Description copied from interface: IGameState
-
Get the current Table +
Gets the number of the first player of the first round

-
Specified by:
getTable in interface IGameState
+
-
Returns:
The current Table
+
Returns:
the number of the first player of the first round

-

-setTable

+

+setFirstRoundFirstPlayer

-public void setTable(ITable table)
+public void setFirstRoundFirstPlayer(int firstRoundFirstPlayer)
-
Description copied from interface: IGameState
-
Sets the current Table +
Sets the number of the first player of the first round

-
Specified by:
setTable in interface IGameState
+
-
Parameters:
table - The new Table
+
Parameters:
firstRoundFirstPlayer - the number of the first player of the first round

-

-getPlayerCount

+

+setLastPlayerRedealed

-public int getPlayerCount()
+public void setLastPlayerRedealed(PlayerSettings lastPlayerRedealed)
-
Description copied from interface: IGameState
-
Returns the number of players +
Sets the player that has redealed last

-
Specified by:
getPlayerCount in interface IGameState
+
- -
Returns:
number of players
+
Parameters:
lastPlayerRedealed - the player to set

-

-nextPlayer

+

+getLastPlayerRedealed

-public void nextPlayer()
+public PlayerSettings getLastPlayerRedealed()
-
Description copied from interface: IGameState
-
Changes the activePlayer to the next Player in the list +
Returns the player that has redealed last

-
Specified by:
nextPlayer in interface IGameState
+
-
+ +
Returns:
the player

-

-getNthNextPlayer

+

+getScores

-public IPlayer getNthNextPlayer(int i)
+public java.util.List<Score> getScores()
-
Description copied from interface: IGameState
-
Returns the player that would be the active player after i turns +
Returns the list of players' scores in the rounds played before

-
Specified by:
getNthNextPlayer in interface IGameState
+
-
Parameters:
i - number of turns -
Returns:
player active after i turns
+ +
Returns:
the list of scores

-

-getActivePlayer

+

+getWinners

-public IPlayer getActivePlayer()
+private java.lang.Boolean[] getWinners(java.lang.Integer[] points, + int[] wins)
-
Description copied from interface: IGameState
-
Returns the currently active player +
Returns whether players have won

-
Specified by:
getActivePlayer in interface IGameState
+
- -
Returns:
currently active player
+
Parameters:
points - the player's points
wins - the number of wins per player +
Returns:
whether a player has won

-

-getGameHeap

+

+getAccumulatedScore

-public StoneHeap getGameHeap()
+public Score getAccumulatedScore()
-
Description copied from interface: IGameState
-
Returns the heap of stones to draw from +
Calculated the accumulated score over the played rounds

-
Specified by:
getGameHeap in interface IGameState
+
-
Returns:
heap of stones
+
Returns:
the accumulated score
@@ -387,7 +472,7 @@ public - PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -408,9 +493,9 @@ public - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD diff --git a/doc/jrummikub/model/Hand.html b/doc/jrummikub/model/Hand.html index 985907a..fdea6c2 100644 --- a/doc/jrummikub/model/Hand.html +++ b/doc/jrummikub/model/Hand.html @@ -2,12 +2,12 @@ - + Hand - + @@ -56,7 +56,7 @@ function windowTitle()  PREV CLASS  - NEXT CLASSNEXT CLASS FRAMES    NO FRAMES   @@ -97,7 +97,7 @@ java.lang.Object extended by jrummikub.model.Hand
-
All Implemented Interfaces:
java.lang.Cloneable, java.lang.Iterable<Pair<Stone,Position>>, IHand, IStoneTray<Stone>
+
All Implemented Interfaces:
java.io.Serializable, java.lang.Cloneable, java.lang.Iterable<Pair<Stone,Position>>, IHand, IStoneTray<Stone>

@@ -109,6 +109,8 @@ Class managing a Serialized Form

@@ -141,11 +143,19 @@ Class managing a -static int -HEIGHT +private static java.util.Comparator<Pair<java.lang.Integer,StoneColor>> +comparator + +
+          The measure to compare the stones by + + + +private static long +serialVersionUID
-          The height of the hand +            @@ -192,6 +202,14 @@ Class managing a +private static Pair<java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer>,java.lang.Integer> +countStones(java.util.List<Stone> stones) + +
+          Counts the numbers of stones + + + protected  Pair<Position,StoneTray.Direction> fixInvalidDrop(Stone stone, Position pos, @@ -201,6 +219,56 @@ Class managing a + + int +getFreeRowSpace(int row) + +
+          Gets the amount of free space in a hand row + + + + int +getIdenticalStoneCount() + +
+          Counts the pairs of identical stones + + + + int +getRowCount() + +
+          The number of used rows + + + + int +getStonePoints(GameSettings settings) + +
+          Get the accumulated number of points of stones in the hand + + + +private static void +incrementStoneCount(java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer> stones, + Pair<java.lang.Integer,StoneColor> stone) + +
+          Increments the count of a stone in the list of all stones + + + + boolean +isInitialMeldPossible(GameSettings settings) + +
+          Tests whether it is possible to lay down an initial meld using the stones + on the hand +   @@ -208,7 +276,7 @@ Class managing a Methods inherited from class jrummikub.model.StoneTray - +
clone, drop, getPosition, getSize, iterator, pickUpclone, contains, drop, getPosition, getSize, iterator, pickUp
  @@ -226,7 +294,7 @@ Class managing a Methods inherited from interface jrummikub.model.IStoneTray -clone, drop, getPosition, getSize, pickUp +clone, contains, drop, getPosition, getSize, pickUp   @@ -251,6 +319,16 @@ Class managing a

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+

WIDTH

@@ -263,15 +341,15 @@ public static final int WIDTH

-

-HEIGHT

+

+comparator

-public static final int HEIGHT
+private static final java.util.Comparator<Pair<java.lang.Integer,StoneColor>> comparator
-
The height of the hand +
The measure to compare the stones by

-
See Also:
Constant Field Values
+
@@ -301,6 +379,42 @@ public Hand() +

+getFreeRowSpace

+
+public int getFreeRowSpace(int row)
+
+
Description copied from interface: IHand
+
Gets the amount of free space in a hand row +

+

+
Specified by:
getFreeRowSpace in interface IHand
+
+
+
Parameters:
row - the row number +
Returns:
the number of stones that can fit into the row
+
+
+
+ +

+getRowCount

+
+public int getRowCount()
+
+
Description copied from interface: IHand
+
The number of used rows +

+

+
Specified by:
getRowCount in interface IHand
+
+
+ +
Returns:
the number of rows
+
+
+
+

fixInvalidDrop

@@ -320,6 +434,95 @@ protected 

+getStonePoints

+
+public int getStonePoints(GameSettings settings)
+
+
Description copied from interface: IHand
+
Get the accumulated number of points of stones in the hand +

+

+
Specified by:
getStonePoints in interface IHand
+
+
+
Parameters:
settings - the game settings +
Returns:
points
+
+
+
+ +

+isInitialMeldPossible

+
+public boolean isInitialMeldPossible(GameSettings settings)
+
+
Description copied from interface: IHand
+
Tests whether it is possible to lay down an initial meld using the stones + on the hand +

+

+
Specified by:
isInitialMeldPossible in interface IHand
+
+
+
Parameters:
settings - the game settings +
Returns:
true if an initial meld is possible
+
+
+
+ +

+incrementStoneCount

+
+private static void incrementStoneCount(java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer> stones,
+                                        Pair<java.lang.Integer,StoneColor> stone)
+
+
Increments the count of a stone in the list of all stones +

+

+
+
+
+
Parameters:
stones - all stones and their respective numbers
stone - the start stone
+
+
+
+ +

+countStones

+
+private static Pair<java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer>,java.lang.Integer> countStones(java.util.List<Stone> stones)
+
+
Counts the numbers of stones +

+

+
+
+
+
Parameters:
stones - the stones to count +
Returns:
the numbers for all stones
+
+
+
+ +

+getIdenticalStoneCount

+
+public int getIdenticalStoneCount()
+
+
Description copied from interface: IHand
+
Counts the pairs of identical stones +

+

+
Specified by:
getIdenticalStoneCount in interface IHand
+
+
+ +
Returns:
number of identical stone pairs
+
+

@@ -352,7 +555,7 @@ protected  PREV CLASS  - NEXT CLASSNEXT CLASS
FRAMES    NO FRAMES   diff --git a/doc/jrummikub/model/IHand.html b/doc/jrummikub/model/IHand.html index 293f9ad..3c8ea74 100644 --- a/doc/jrummikub/model/IHand.html +++ b/doc/jrummikub/model/IHand.html @@ -2,12 +2,12 @@ - + IHand - + @@ -55,7 +55,7 @@ function windowTitle() PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -76,9 +76,9 @@ function windowTitle() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD @@ -92,7 +92,7 @@ jrummikub.model
Interface IHand
-
All Superinterfaces:
java.lang.Cloneable, IStoneTray<Stone>, java.lang.Iterable<Pair<Stone,Position>>
+
All Superinterfaces:
java.lang.Cloneable, IStoneTray<Stone>, java.lang.Iterable<Pair<Stone,Position>>, java.io.Serializable
All Known Implementing Classes:
Hand
@@ -119,6 +119,47 @@ Interface for the Method Summary + + + int +getFreeRowSpace(int row) + +
+          Gets the amount of free space in a hand row + + + + int +getIdenticalStoneCount() + +
+          Counts the pairs of identical stones + + + + int +getRowCount() + +
+          The number of used rows + + + + int +getStonePoints(GameSettings settings) + +
+          Get the accumulated number of points of stones in the hand + + + + boolean +isInitialMeldPossible(GameSettings settings) + +
+          Tests whether it is possible to lay down an initial meld using the stones + on the hand +   @@ -126,7 +167,7 @@ Interface for the Methods inherited from interface jrummikub.model.IStoneTray - +
clone, drop, getPosition, getSize, pickUpclone, contains, drop, getPosition, getSize, pickUp
  @@ -140,6 +181,101 @@ Interface for the + + + + +
+Method Detail
+ +

+getRowCount

+
+int getRowCount()
+
+
The number of used rows +

+

+
+
+
+ +
Returns:
the number of rows
+
+
+
+ +

+getFreeRowSpace

+
+int getFreeRowSpace(int row)
+
+
Gets the amount of free space in a hand row +

+

+
+
+
+
Parameters:
row - the row number +
Returns:
the number of stones that can fit into the row
+
+
+
+ +

+getStonePoints

+
+int getStonePoints(GameSettings settings)
+
+
Get the accumulated number of points of stones in the hand +

+

+
+
+
+
Parameters:
settings - the game settings +
Returns:
points
+
+
+
+ +

+isInitialMeldPossible

+
+boolean isInitialMeldPossible(GameSettings settings)
+
+
Tests whether it is possible to lay down an initial meld using the stones + on the hand +

+

+
+
+
+
Parameters:
settings - the game settings +
Returns:
true if an initial meld is possible
+
+
+
+ +

+getIdenticalStoneCount

+
+int getIdenticalStoneCount()
+
+
Counts the pairs of identical stones +

+

+
+
+
+ +
Returns:
number of identical stone pairs
+
+

@@ -171,7 +307,7 @@ Interface for the PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -192,9 +328,9 @@ Interface for the - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD diff --git a/doc/jrummikub/model/IPlayer.html b/doc/jrummikub/model/IPlayer.html index 9e6e86d..38beef7 100644 --- a/doc/jrummikub/model/IPlayer.html +++ b/doc/jrummikub/model/IPlayer.html @@ -2,12 +2,12 @@ - + IPlayer - + @@ -56,7 +56,7 @@ function windowTitle()  PREV CLASS  - NEXT CLASSNEXT CLASS FRAMES    NO FRAMES   @@ -92,11 +92,14 @@ jrummikub.model
Interface IPlayer
+
All Superinterfaces:
java.io.Serializable
+
+
All Known Implementing Classes:
Player

-
public interface IPlayer
+
public interface IPlayer
extends java.io.Serializable

@@ -118,27 +121,75 @@ Interface for - java.awt.Color -getColor() + IHand +getHand()
-          Return the player's color +          Get the current hand of the player - IHand -getHand() + boolean +getLaidOut()
-          Get the current hand of the player +          Has the player laid out yet? + + + + int +getLastTurnStoneCount() + +
+          Gets the number of stones put on table in player's last turn + + + + PlayerSettings +getPlayerSettings() + +
+          Returns the player settings + + + + void +setHand(IHand hand) + +
+          Set the current hand of the player + + + + void +setLaidOut(boolean laidOut) + +
+          Set if the player laid out + + + + void +setLastTurnInvalid(boolean value) + +
+          Sets last turn invalid - java.lang.String -getName() + void +setLastTurnStoneCount(int value)
-          Return the name of the player +          Sets the number of stones out on the table in player's last turn + + + + boolean +wasLastTurnInvalid() + +
+          Getter for last turn invalid   @@ -162,36 +213,143 @@ getHand

Get the current hand of the player

+
+
+
Returns:
the player's hand

-

-getColor

+

+setHand

-java.awt.Color getColor()
+void setHand(IHand hand)
-
Return the player's color +
Set the current hand of the player

+
+
+
+
Parameters:
hand - the new hand
+
+
+
+ +

+getLaidOut

+
+boolean getLaidOut()
+
+
Has the player laid out yet? +

+

+
+
+
-
Returns:
the player's color
+
Returns:
if the player has laid out

-

-getName

+

+getPlayerSettings

-java.lang.String getName()
+PlayerSettings getPlayerSettings()
-
Return the name of the player +
Returns the player settings

+
+
+
-
Returns:
the player's name
+
Returns:
the player settings
+ + +
+ +

+setLaidOut

+
+void setLaidOut(boolean laidOut)
+
+
Set if the player laid out +

+

+
+
+
+
Parameters:
laidOut - the player laid out
+
+
+
+ +

+wasLastTurnInvalid

+
+boolean wasLastTurnInvalid()
+
+
Getter for last turn invalid +

+

+
+
+
+ +
Returns:
last turn invalid
+
+
+
+ +

+setLastTurnInvalid

+
+void setLastTurnInvalid(boolean value)
+
+
Sets last turn invalid +

+

+
+
+
+
Parameters:
value - last turn invalid
+
+
+
+ +

+getLastTurnStoneCount

+
+int getLastTurnStoneCount()
+
+
Gets the number of stones put on table in player's last turn +

+

+
+
+
+ +
Returns:
number of stones
+
+
+
+ +

+setLastTurnStoneCount

+
+void setLastTurnStoneCount(int value)
+
+
Sets the number of stones out on the table in player's last turn +

+

+
+
+
+
Parameters:
value - number of stones
@@ -226,7 +384,7 @@ java.lang.String getName()  PREV CLASS  - NEXT CLASSNEXT CLASS FRAMES    NO FRAMES   diff --git a/doc/jrummikub/model/IStoneTray.html b/doc/jrummikub/model/IStoneTray.html index f2a07c7..341c384 100644 --- a/doc/jrummikub/model/IStoneTray.html +++ b/doc/jrummikub/model/IStoneTray.html @@ -2,12 +2,12 @@ - + IStoneTray - + @@ -55,7 +55,7 @@ function windowTitle() PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -94,7 +94,7 @@ Interface IStoneTray<E extends
Type Parameters:
E - Objects held by the IStoneTray
-
All Superinterfaces:
java.lang.Cloneable, java.lang.Iterable<Pair<E,Position>>
+
All Superinterfaces:
java.lang.Cloneable, java.lang.Iterable<Pair<E,Position>>, java.io.Serializable
All Known Subinterfaces:
IHand, ITable
@@ -104,7 +104,7 @@ Interface IStoneTray<E extends
-
public interface IStoneTray<E extends Sizeable>
extends java.lang.Iterable<Pair<E,Position>>, java.lang.Cloneable
+
public interface IStoneTray<E extends Sizeable>
extends java.lang.Iterable<Pair<E,Position>>, java.lang.Cloneable, java.io.Serializable

@@ -134,6 +134,14 @@ Interface for the + boolean +contains(E object) + +
+          Search for an object within the stone tray + + +  void drop(E object, Position position) @@ -271,6 +279,23 @@ int getSize()

Returns:
number of objects
+
+ +

+contains

+
+boolean contains(E object)
+
+
Search for an object within the stone tray +

+

+
+
+
+
Parameters:
object - object to search for +
Returns:
object found in stone tray
+
+

@@ -302,7 +327,7 @@ int getSize() PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   diff --git a/doc/jrummikub/model/ITable.html b/doc/jrummikub/model/ITable.html index ea079ae..e753208 100644 --- a/doc/jrummikub/model/ITable.html +++ b/doc/jrummikub/model/ITable.html @@ -2,12 +2,12 @@ - + ITable - + @@ -92,7 +92,7 @@ jrummikub.model
Interface ITable
-
All Superinterfaces:
java.lang.Cloneable, IStoneTray<StoneSet>, java.lang.Iterable<Pair<StoneSet,Position>>
+
All Superinterfaces:
java.lang.Cloneable, IStoneTray<StoneSet>, java.lang.Iterable<Pair<StoneSet,Position>>, java.io.Serializable
All Known Implementing Classes:
Table
@@ -150,7 +150,7 @@ Interface for the Methods inherited from interface jrummikub.model.IStoneTray -clone, drop, getPosition, getSize, pickUp +clone, contains, drop, getPosition, getSize, pickUp   diff --git a/doc/jrummikub/model/Player.html b/doc/jrummikub/model/Player.html index a3f4e3d..d1aa71f 100644 --- a/doc/jrummikub/model/Player.html +++ b/doc/jrummikub/model/Player.html @@ -2,12 +2,12 @@ - + Player - + @@ -56,7 +56,7 @@ function windowTitle()  PREV CLASS  - NEXT CLASSNEXT CLASS
FRAMES    NO FRAMES   @@ -76,9 +76,9 @@ function windowTitle() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD
@@ -96,7 +96,7 @@ java.lang.Object extended by jrummikub.model.Player
-
All Implemented Interfaces:
IPlayer
+
All Implemented Interfaces:
java.io.Serializable, IPlayer

@@ -108,10 +108,69 @@ Class managing player data. No methods in release 1

+

+
See Also:
Serialized Form

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Field Summary
+private  IHandhand + +
+           
+private  booleanlaidOut + +
+           
+private  booleanlastTurnInvalid + +
+           
+private  intlastTurnStoneCount +
+           
+private static longserialVersionUID + +
+           
+private  PlayerSettingssettings + +
+           
@@ -121,8 +180,7 @@ Class managing player data. No methods in release 1 Constructor Summary -Player(java.lang.String name, - java.awt.Color color) +Player(PlayerSettings settings)
          Create a new player with a given name and color @@ -139,27 +197,75 @@ Class managing player data. No methods in release 1 - java.awt.Color -getColor() + IHand +getHand()
-          Return the player's color +          Get the current hand of the player - IHand -getHand() + boolean +getLaidOut()
-          Get the current hand of the player +          Has the player laid out yet? - java.lang.String -getName() + int +getLastTurnStoneCount()
-          Return the name of the player +          Gets the number of stones put on table in player's last turn + + + + PlayerSettings +getPlayerSettings() + +
+          Returns the player settings + + + + void +setHand(IHand hand) + +
+          Set the current hand of the player + + + + void +setLaidOut(boolean laidOut) + +
+          Set if the player laid out + + + + void +setLastTurnInvalid(boolean value) + +
+          Sets last turn invalid + + + + void +setLastTurnStoneCount(int value) + +
+          Sets the number of stones out on the table in player's last turn + + + + boolean +wasLastTurnInvalid() + +
+          Getter for last turn invalid   @@ -174,6 +280,75 @@ Class managing player data. No methods in release 1  

+ + + + + + + +
+Field Detail
+ +

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+ +

+settings

+
+private PlayerSettings settings
+
+
+
+
+
+ +

+hand

+
+private IHand hand
+
+
+
+
+
+ +

+laidOut

+
+private boolean laidOut
+
+
+
+
+
+ +

+lastTurnInvalid

+
+private boolean lastTurnInvalid
+
+
+
+
+
+ +

+lastTurnStoneCount

+
+private int lastTurnStoneCount
+
+
+
+
+ @@ -184,16 +359,15 @@ Class managing player data. No methods in release 1 -

+

Player

-public Player(java.lang.String name,
-              java.awt.Color color)
+public Player(PlayerSettings settings)
Create a new player with a given name and color

-
Parameters:
name - player name
color - player's color
+
Parameters:
settings - the player settings
@@ -224,38 +398,142 @@ public

-getColor

+

+setHand

-public java.awt.Color getColor()
+public void setHand(IHand hand)
-
Description copied from interface: IPlayer
-
Return the player's color +
Description copied from interface: IPlayer
+
Set the current hand of the player

-
Specified by:
getColor in interface IPlayer
+
Specified by:
setHand in interface IPlayer
+
Parameters:
hand - the new hand
+
+
+
-
Returns:
the player's color +

+getLaidOut

+
+public boolean getLaidOut()
+
+
Description copied from interface: IPlayer
+
Has the player laid out yet? +

+

+
Specified by:
getLaidOut in interface IPlayer
+
+
+ +
Returns:
if the player has laid out

-

-getName

+

+setLaidOut

-public java.lang.String getName()
+public void setLaidOut(boolean laidOut)
-
Description copied from interface: IPlayer
-
Return the name of the player +
Description copied from interface: IPlayer
+
Set if the player laid out

-
Specified by:
getName in interface IPlayer
+
Specified by:
setLaidOut in interface IPlayer
+
Parameters:
laidOut - the player laid out
+
+ +
-
Returns:
the player's name +

+getPlayerSettings

+
+public PlayerSettings getPlayerSettings()
+
+
Description copied from interface: IPlayer
+
Returns the player settings +

+

+
Specified by:
getPlayerSettings in interface IPlayer
+
+
+ +
Returns:
the player settings
+
+
+
+ +

+wasLastTurnInvalid

+
+public boolean wasLastTurnInvalid()
+
+
Description copied from interface: IPlayer
+
Getter for last turn invalid +

+

+
Specified by:
wasLastTurnInvalid in interface IPlayer
+
+
+ +
Returns:
last turn invalid
+
+
+
+ +

+setLastTurnInvalid

+
+public void setLastTurnInvalid(boolean value)
+
+
Description copied from interface: IPlayer
+
Sets last turn invalid +

+

+
Specified by:
setLastTurnInvalid in interface IPlayer
+
+
+
Parameters:
value - last turn invalid
+
+
+
+ +

+getLastTurnStoneCount

+
+public int getLastTurnStoneCount()
+
+
Description copied from interface: IPlayer
+
Gets the number of stones put on table in player's last turn +

+

+
Specified by:
getLastTurnStoneCount in interface IPlayer
+
+
+ +
Returns:
number of stones
+
+
+
+ +

+setLastTurnStoneCount

+
+public void setLastTurnStoneCount(int value)
+
+
Description copied from interface: IPlayer
+
Sets the number of stones out on the table in player's last turn +

+

+
Specified by:
setLastTurnStoneCount in interface IPlayer
+
+
+
Parameters:
value - number of stones
@@ -290,7 +568,7 @@ public java.lang.String getName()  PREV CLASS  - NEXT CLASSNEXT CLASS FRAMES    NO FRAMES   @@ -310,9 +588,9 @@ public java.lang.String getName() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD diff --git a/doc/jrummikub/model/Position.html b/doc/jrummikub/model/Position.html index 80f96fd..5a369cb 100644 --- a/doc/jrummikub/model/Position.html +++ b/doc/jrummikub/model/Position.html @@ -2,12 +2,12 @@ - + Position - + @@ -55,8 +55,8 @@ function windowTitle() PREV CLASS  - NEXT CLASSPREV CLASS  + NEXT CLASS FRAMES    NO FRAMES   @@ -76,9 +76,9 @@ function windowTitle() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD @@ -95,9 +95,12 @@ Class Position java.lang.Object extended by jrummikub.model.Position +
+
All Implemented Interfaces:
java.io.Serializable
+

-
public class Position
extends java.lang.Object
+
public class Position
extends java.lang.Object
implements java.io.Serializable

@@ -106,10 +109,45 @@ java.lang.Object

+

+
See Also:
Serialized Form

+ + + + + + + + + + + + + + + + + + + +
+Field Summary
+private static longserialVersionUID + +
+           
+private  doublex + +
+           
+private  doubley +
+           
@@ -119,8 +157,8 @@ java.lang.Object Constructor Summary -Position(float x, - float y) +Position(double x, + double y)
          Create a new position by specifying the coordinates @@ -145,7 +183,7 @@ java.lang.Object - float + double getX()
@@ -153,7 +191,7 @@ java.lang.Object - float + double getY()
@@ -188,6 +226,45 @@ java.lang.Object  

+ + + + + + + +
+Field Detail
+ +

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+ +

+x

+
+private double x
+
+
+
+
+
+ +

+y

+
+private double y
+
+
+
+
+ @@ -198,11 +275,11 @@ java.lang.Object -

+

Position

-public Position(float x,
-                float y)
+public Position(double x, + double y)
Create a new position by specifying the coordinates

@@ -223,11 +300,14 @@ public Position(float x,

getX

-public float getX()
+public double getX()
Get the x coordinate of the position

+
+
+
Returns:
x coordinate
@@ -237,11 +317,14 @@ public float getX()

getY

-public float getY()
+public double getY()
Get the y coordinate of the position

+
+
+
Returns:
y coordinate
@@ -319,8 +402,8 @@ public int hashCode() PREV CLASS  - NEXT CLASSPREV CLASS  + NEXT CLASS FRAMES    NO FRAMES   @@ -340,9 +423,9 @@ public int hashCode() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD diff --git a/doc/jrummikub/model/Sizeable.html b/doc/jrummikub/model/Sizeable.html index f6a2942..2ca5dcf 100644 --- a/doc/jrummikub/model/Sizeable.html +++ b/doc/jrummikub/model/Sizeable.html @@ -2,12 +2,12 @@ - + Sizeable - + @@ -55,7 +55,7 @@ function windowTitle() PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   @@ -205,7 +205,7 @@ float getHeight() PREV CLASS  + PREV CLASS   NEXT CLASS FRAMES   diff --git a/doc/jrummikub/model/Stone.html b/doc/jrummikub/model/Stone.html index 97fafb2..6f694c5 100644 --- a/doc/jrummikub/model/Stone.html +++ b/doc/jrummikub/model/Stone.html @@ -2,12 +2,12 @@ - + Stone - + @@ -76,9 +76,9 @@ function windowTitle() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD @@ -96,11 +96,11 @@ java.lang.Object extended by jrummikub.model.Stone
-
All Implemented Interfaces:
Sizeable
+
All Implemented Interfaces:
java.io.Serializable, Sizeable

-
public class Stone
extends java.lang.Object
implements Sizeable
+
public class Stone
extends java.lang.Object
implements Sizeable, java.io.Serializable

@@ -108,10 +108,53 @@ Basic Rummikub Stone

+

+
See Also:
Serialized Form

+ + + + + + + + + + + + + + + + + + + + + + + +
+Field Summary
+private  StoneColorcolor + +
+           
+private  booleanjoker + +
+           
+private static longserialVersionUID + +
+           
+private  intvalue +
+           
@@ -204,6 +247,55 @@ Basic Rummikub Stone  

+ + + + + + + +
+Field Detail
+ +

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+ +

+value

+
+private int value
+
+
+
+
+
+ +

+color

+
+private StoneColor color
+
+
+
+
+
+ +

+joker

+
+private final boolean joker
+
+
+
+
+ @@ -219,8 +311,7 @@ Stone
 public Stone(StoneColor color)
-
Creates a joker of the given color. The color is only used for - displaying. +
Creates a joker of the given color. The color is only used for displaying.

Parameters:
color - joker color
@@ -400,9 +491,9 @@ public java.lang.String toString() - SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD diff --git a/doc/jrummikub/model/StoneColor.html b/doc/jrummikub/model/StoneColor.html index 800023b..6921c5c 100644 --- a/doc/jrummikub/model/StoneColor.html +++ b/doc/jrummikub/model/StoneColor.html @@ -2,12 +2,12 @@ - + StoneColor - + @@ -121,6 +121,12 @@ Class specifying possible StoneColors Enum Constant Summary +AQUA + +
+            + + BLACK
@@ -129,6 +135,18 @@ Class specifying possible StoneColors BLUE +
+            + + +GRAY + +
+            + + +GREEN +
            @@ -141,6 +159,12 @@ Class specifying possible StoneColors RED +
+            + + +VIOLET +
            @@ -241,6 +265,46 @@ public static final

+GREEN

+
+public static final StoneColor GREEN
+
+
+
+
+
+ +

+VIOLET

+
+public static final StoneColor VIOLET
+
+
+
+
+
+ +

+AQUA

+
+public static final StoneColor AQUA
+
+
+
+
+
+ +

+GRAY

+
+public static final StoneColor GRAY
+
+
+
+
diff --git a/doc/jrummikub/model/StoneHeap.html b/doc/jrummikub/model/StoneHeap.html index 35429a0..e0eb1ee 100644 --- a/doc/jrummikub/model/StoneHeap.html +++ b/doc/jrummikub/model/StoneHeap.html @@ -2,12 +2,12 @@ - + StoneHeap - + @@ -95,9 +95,12 @@ Class StoneHeap java.lang.Object extended by jrummikub.model.StoneHeap +
+
All Implemented Interfaces:
java.io.Serializable
+

-
public class StoneHeap
extends java.lang.Object
+
public class StoneHeap
extends java.lang.Object
implements java.io.Serializable

@@ -106,6 +109,8 @@ StoneHeap creates all Serialized Form


@@ -119,9 +124,25 @@ StoneHeap creates all -(package private)  java.util.List<Stone> +private  java.util.Random +generator + +
+            + + + +(package private)  java.util.ArrayList<Stone> heap +
+            + + + +private static long +serialVersionUID +
            @@ -136,7 +157,7 @@ StoneHeap creates all -StoneHeap() +StoneHeap(GameSettings gameSettings)
          Creates 106 Stones according to standard rules @@ -206,10 +227,30 @@ StoneHeap creates all

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+

heap

-java.util.List<Stone> heap
+java.util.ArrayList<Stone> heap +
+
+
+
+
+ +

+generator

+
+private java.util.Random generator
@@ -225,13 +266,15 @@ java.util.List<

+

StoneHeap

-public StoneHeap()
+public StoneHeap(GameSettings gameSettings)
Creates 106 Stones according to standard rules

+

+
Parameters:
gameSettings - (for number of sets/jokers, colors etc.)
@@ -252,6 +295,9 @@ public Stone from the heap and returns it

+
+
+
Returns:
the drawn stone
@@ -266,6 +312,9 @@ public java.util.List<Stones from the heap and returns them

+
+
+
Parameters:
number - number of requested Stones
Returns:
list of drawn stones
@@ -280,6 +329,9 @@ public int getSize()
Get the number of stones left

+
+
+
Returns:
number of stones on the heap
@@ -294,6 +346,9 @@ public void putBack(java.util.Collection< + diff --git a/doc/jrummikub/model/StoneSet.html b/doc/jrummikub/model/StoneSet.html index c476ebe..0cf4073 100644 --- a/doc/jrummikub/model/StoneSet.html +++ b/doc/jrummikub/model/StoneSet.html @@ -2,12 +2,12 @@ - + StoneSet - + @@ -96,11 +96,11 @@ java.lang.Object extended by jrummikub.model.StoneSet
-
All Implemented Interfaces:
java.lang.Iterable<Stone>, Sizeable
+
All Implemented Interfaces:
java.io.Serializable, java.lang.Iterable<Stone>, Sizeable

-
public class StoneSet
extends java.lang.Object
implements java.lang.Iterable<Stone>, Sizeable
+
public class StoneSet
extends java.lang.Object
implements java.lang.Iterable<Stone>, Sizeable, java.io.Serializable

@@ -108,6 +108,8 @@ Class managing Serialized Form


@@ -141,6 +143,22 @@ Class managing HORIZONTAL_BORDER +
+            + + + +private static long +serialVersionUID + +
+            + + + +private  java.util.ArrayList<Stone> +stones +
            @@ -186,12 +204,21 @@ Class managing - StoneSet.Type -classify() + Pair<StoneSet.Type,java.lang.Integer> +classify(GameSettings settings)
-          Test for rule conflict within the StoneSet and determine whether the set - is a group or a run +          Test for rule conflict within the StoneSet and determine whether the set is + a group or a run + + + +private  Pair<StoneSet.Type,java.lang.Integer> +classifyJokersOnly(GameSettings settings) + +
+          Test for rule conflict within a StoneSet with jokers only and determine + whether the set is a group or a run @@ -211,6 +238,14 @@ Class managing + int +getSize() + +
+          Returns the number of stones in the set. + + +  float getWidth() @@ -220,13 +255,31 @@ Class managing  boolean -isValid() +isValid(GameSettings settings)
          Test for rule conflict within the StoneSet +private  int +isValidGroup(int value, + GameSettings settings) + +
+          Test for rule conflict within the StoneSet, assuming we have a group + + + +private  int +isValidRun(int referencePosition, + GameSettings settings) + +
+          Test for rule conflict within the StoneSet, assuming we have a run + + +  java.util.Iterator<Stone> iterator() @@ -243,14 +296,6 @@ Class managing - int -size() - -
-          Returns the number of stones in the set. - - -  Pair<StoneSet,StoneSet> splitAt(int position) @@ -289,6 +334,16 @@ Class managing

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+

VERTICAL_BORDER

@@ -307,6 +362,16 @@ static final float HORIZONTAL_BORDER
See Also:
Constant Field Values
+
+ +

+stones

+
+private java.util.ArrayList<Stone> stones
+
+
+
+
@@ -351,10 +416,10 @@ public StoneSet(java.util.List<

+

isValid

-public boolean isValid()
+public boolean isValid(GameSettings settings)
Test for rule conflict within the StoneSet

@@ -362,26 +427,80 @@ public boolean isValid()

- +
Parameters:
settings - GameSettings
Returns:
true when the set is valid according to the rules

-

+

classify

-public StoneSet.Type classify()
+public Pair<StoneSet.Type,java.lang.Integer> classify(GameSettings settings) +
+
Test for rule conflict within the StoneSet and determine whether the set is + a group or a run +

+

+
+
+
+
Parameters:
settings - GameSettings +
Returns:
GROUP or RUN for valid sets, INVALID otherwise and the points
+
+
+
+ +

+classifyJokersOnly

+
+private Pair<StoneSet.Type,java.lang.Integer> classifyJokersOnly(GameSettings settings)
+
+
Test for rule conflict within a StoneSet with jokers only and determine + whether the set is a group or a run +

+

+
+
+
+
Parameters:
settings - the game settings +
Returns:
GROUP or RUN for valid sets, INVALID otherwise and the points
+
+
+
+ +

+isValidRun

+
+private int isValidRun(int referencePosition,
+                       GameSettings settings)
-
Test for rule conflict within the StoneSet and determine whether the set - is a group or a run +
Test for rule conflict within the StoneSet, assuming we have a run

+
Parameters:
referencePosition - position of stone used as reference (any non-joker stone)
settings - the game settings +
Returns:
the set's points
+
+
+
-
Returns:
GROUP or RUN for valid sets, INVALID otherwise +

+isValidGroup

+
+private int isValidGroup(int value,
+                         GameSettings settings)
+
+
Test for rule conflict within the StoneSet, assuming we have a group +

+

+
+
+
+
Parameters:
value - the value of the stones (all have the same in a group)
settings - the game settings +
Returns:
the set's points

@@ -421,10 +540,10 @@ public

-size

+

+getSize

-public int size()
+public int getSize()
Returns the number of stones in the set.

diff --git a/doc/jrummikub/model/StoneTray.Direction.html b/doc/jrummikub/model/StoneTray.Direction.html index c5fe015..6fc3fad 100644 --- a/doc/jrummikub/model/StoneTray.Direction.html +++ b/doc/jrummikub/model/StoneTray.Direction.html @@ -2,12 +2,12 @@ - + StoneTray.Direction - + diff --git a/doc/jrummikub/model/StoneTray.html b/doc/jrummikub/model/StoneTray.html index 60468cb..f5e457c 100644 --- a/doc/jrummikub/model/StoneTray.html +++ b/doc/jrummikub/model/StoneTray.html @@ -2,12 +2,12 @@ - + StoneTray - + @@ -98,7 +98,7 @@ java.lang.Object

Type Parameters:
E - Type of positioned objects (must implement Sizeable)
-
All Implemented Interfaces:
java.lang.Cloneable, java.lang.Iterable<Pair<E,Position>>, IStoneTray<E>
+
All Implemented Interfaces:
java.io.Serializable, java.lang.Cloneable, java.lang.Iterable<Pair<E,Position>>, IStoneTray<E>
Direct Known Subclasses:
Hand, Table
@@ -114,6 +114,8 @@ A StoneTray is a collection of positioned objects (for example Serialized Form

@@ -147,6 +149,14 @@ A StoneTray is a collection of positioned objects (for example E,Pair<E,Position>> objects +
+            + + + +private static long +serialVersionUID +
            @@ -186,6 +196,14 @@ A StoneTray is a collection of positioned objects (for example + boolean +contains(E object) + +
+          Search for an object within the stone tray + + +  void drop(E object, Position position) @@ -195,6 +213,27 @@ A StoneTray is a collection of positioned objects (for example +private  void +drop(E object, + Position position, + StoneTray.Direction direction) + +
+          Subroutine to "drop" to consider and determine the direction the objects + dropped one collides with position-wise evade in + + + +private  void +dropUnchecked(E object, + Position position, + StoneTray.Direction direction) + +
+          Subroutine to "drop" to execute the actual drop + + + protected  Pair<Position,StoneTray.Direction> fixInvalidDrop(E object, Position pos, @@ -206,6 +245,38 @@ A StoneTray is a collection of positioned objects (for example +private  StoneTray.Direction +getMoveDirection(E object, + Position position, + Pair<E,Position> blocking) + +
+          Returns the direction to move the object in + + + +private  boolean +getMoveOrientation(E object, + Position position, + Pair<E,Position> blocking) + +
+          Will the object be moved horizontally or vertically + + + +private  Position +getNewPosition(E object, + Position position, + StoneTray.Direction newDirection, + E currentObject, + Position currentPosition) + +
+            + + +  Position getPosition(E object) @@ -230,6 +301,27 @@ A StoneTray is a collection of positioned objects (for example +private static boolean +lessOrEqual(double d, + double e) + +
+          Static method for determining a less or equal relation considering a + small fuzziness + + + +private  boolean +objectsOverlap(E object1, + Position position1, + E object2, + Position position2) + +
+          Tests whether two objects overlap + + +  boolean pickUp(E object) @@ -259,6 +351,16 @@ A StoneTray is a collection of positioned objects (for example

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+

objects

@@ -313,6 +415,61 @@ public void drop(

+drop

+
+private void drop(E object,
+                  Position position,
+                  StoneTray.Direction direction)
+
+
Subroutine to "drop" to consider and determine the direction the objects + dropped one collides with position-wise evade in +

+

+
+
+
+
Parameters:
object - the object to add to Hand
position - Position to put the object
direction - the direction the other stones evade in
+
+
+
+ +

+dropUnchecked

+
+private void dropUnchecked(E object,
+                           Position position,
+                           StoneTray.Direction direction)
+
+
Subroutine to "drop" to execute the actual drop +

+

+
+
+
+
Parameters:
object - the object to add to Hand
position - Position to put the object
direction - the direction the other stones evade in
+
+
+
+ +

+getNewPosition

+
+private Position getNewPosition(E object,
+                                Position position,
+                                StoneTray.Direction newDirection,
+                                E currentObject,
+                                Position currentPosition)
+
+
+
+
+
+
+
+
+
+

fixInvalidDrop

@@ -333,6 +490,83 @@ protected 

+lessOrEqual

+
+private static boolean lessOrEqual(double d,
+                                   double e)
+
+
Static method for determining a less or equal relation considering a + small fuzziness +

+

+
+
+
+
Parameters:
d - the value to be less or equal
e - than the other one +
Returns:
if d is less or equal e
+
+
+
+ +

+objectsOverlap

+
+private boolean objectsOverlap(E object1,
+                               Position position1,
+                               E object2,
+                               Position position2)
+
+
Tests whether two objects overlap +

+

+
+
+
+
Parameters:
object1 - first object
position1 - first object's position
object2 - second object
position2 - second object's position +
Returns:
whether they overlap
+
+
+
+ +

+getMoveDirection

+
+private StoneTray.Direction getMoveDirection(E object,
+                                             Position position,
+                                             Pair<E,Position> blocking)
+
+
Returns the direction to move the object in +

+

+
+
+
+
Parameters:
object - the object
position - the object's position
blocking - the object thats blocking +
Returns:
the direction
+
+
+
+ +

+getMoveOrientation

+
+private boolean getMoveOrientation(E object,
+                                   Position position,
+                                   Pair<E,Position> blocking)
+
+
Will the object be moved horizontally or vertically +

+

+
+
+
+
Parameters:
object - the object
position - the objects position
blocking - the object thats blocking +
Returns:
boolean vertical movement
+
+
+
+

getPosition

@@ -351,6 +585,24 @@ public 

+contains

+
+public boolean contains(E object)
+
+
Description copied from interface: IStoneTray
+
Search for an object within the stone tray +

+

+
Specified by:
contains in interface IStoneTray<E extends Sizeable>
+
+
+
Parameters:
object - object to search for +
Returns:
object found in stone tray
+
+
+
+

iterator

diff --git a/doc/jrummikub/model/Table.html b/doc/jrummikub/model/Table.html
index 989a94d..009c7a4 100644
--- a/doc/jrummikub/model/Table.html
+++ b/doc/jrummikub/model/Table.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Table
 
 
-
+
 
 
 
@@ -56,7 +56,7 @@ function windowTitle()
 
 
  PREV CLASS 
- NEXT CLASSNEXT CLASS
 
   FRAMES   
  NO FRAMES   
@@ -76,9 +76,9 @@ function windowTitle()
 
 
 
-  SUMMARY: NESTED | FIELD | CONSTR | METHOD
+  SUMMARY: NESTED | FIELD | CONSTR | METHOD
 
-DETAIL: FIELD | CONSTR | METHOD
+DETAIL: FIELD | CONSTR | METHOD
 
 
 
@@ -97,7 +97,7 @@ java.lang.Object
       extended by jrummikub.model.Table
 
-
All Implemented Interfaces:
java.lang.Cloneable, java.lang.Iterable<Pair<StoneSet,Position>>, IStoneTray<StoneSet>, ITable
+
All Implemented Interfaces:
java.io.Serializable, java.lang.Cloneable, java.lang.Iterable<Pair<StoneSet,Position>>, IStoneTray<StoneSet>, ITable

@@ -109,6 +109,8 @@ Class administering the Serialized Form

@@ -120,6 +122,14 @@ Class administering the Nested Class Summary + + +private static class +Table.StoneInfo + +
+            +   @@ -139,6 +149,22 @@ Class administering the Field Summary + + + + + + + +
+private  GameSettingsgameSettings + +
+           
+private static longserialVersionUID + +
+           
  @@ -159,10 +185,10 @@ Class administering the - +          Constructor for a table
Table() +Table(GameSettings settings)
-           
  @@ -176,6 +202,14 @@ Class administering the +private  Table.StoneInfo +findStoneInfo(Stone stone) + +
+          Finds Table.StoneInfo + + +  StoneSet findStoneSet(Stone stone) @@ -198,6 +232,16 @@ Class administering the Stone from the Table + + +private  void +splitSet(StoneSet set, + Position setPosition, + int stonePosition) + +
+          Splits a stone set at a specified position +   @@ -205,7 +249,7 @@ Class administering the Methods inherited from class jrummikub.model.StoneTray - +
clone, drop, fixInvalidDrop, getPosition, getSize, iterator, pickUpclone, contains, drop, fixInvalidDrop, getPosition, getSize, iterator, pickUp
  @@ -223,7 +267,7 @@ Class administering the Methods inherited from interface jrummikub.model.IStoneTray -clone, drop, getPosition, getSize, pickUp +clone, contains, drop, getPosition, getSize, pickUp   @@ -238,6 +282,35 @@ Class administering the + + + + +
+Field Detail
+ +

+serialVersionUID

+
+private static final long serialVersionUID
+
+
+
See Also:
Constant Field Values
+
+
+ +

+gameSettings

+
+private GameSettings gameSettings
+
+
+
+
+ @@ -248,11 +321,15 @@ Class administering the

+

Table

-public Table()
+public Table(GameSettings settings)
+
+
Constructor for a table +

+
Parameters:
settings - GameSettings
@@ -281,6 +358,23 @@ public void pickUpStone(
+

+findStoneInfo

+
+private Table.StoneInfo findStoneInfo(Stone stone)
+
+
Finds Table.StoneInfo +

+

+
+
+
+
Parameters:
stone - the stone +
Returns:
the info
+
+
+
+

findStoneSet

@@ -299,6 +393,24 @@ public 

+splitSet

+
+private void splitSet(StoneSet set,
+                      Position setPosition,
+                      int stonePosition)
+
+
Splits a stone set at a specified position +

+

+
+
+
+
Parameters:
set - the stone set to split
setPosition - the set's position on the table
stonePosition - the stone after which splitting should occur
+
+
+
+

isValid

@@ -346,7 +458,7 @@ public boolean isValid()
 PREV CLASS  - NEXT CLASSNEXT CLASS FRAMES    NO FRAMES   @@ -366,9 +478,9 @@ public boolean isValid()
- SUMMARY: NESTED | FIELD | CONSTR | METHOD + SUMMARY: NESTED | FIELD | CONSTR | METHOD -DETAIL: FIELD | CONSTR | METHOD +DETAIL: FIELD | CONSTR | METHOD diff --git a/doc/jrummikub/model/class-use/GameState.html b/doc/jrummikub/model/class-use/GameState.html index 166ec0a..d30de82 100644 --- a/doc/jrummikub/model/class-use/GameState.html +++ b/doc/jrummikub/model/class-use/GameState.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.GameState - + @@ -83,7 +83,176 @@ function windowTitle()

Uses of Class
jrummikub.model.GameState

-No usage of jrummikub.model.GameState + + + + + + + + + + + + + +
+Packages that use GameState
jrummikub.control  
jrummikub.model  
+  +

+ + + + + +
+Uses of GameState in jrummikub.control
+  +

+ + + + + + + + + + + + + +
Fields in jrummikub.control declared as GameState
+protected  GameStateGameControl.gameState + +
+           
+private  GameStateSaveControl.gameState + +
+           
+  +

+ + + + + + + + + +
Fields in jrummikub.control with type parameters of type GameState
+private  Event3<GameSettings,GameState,IRoundState>SaveControl.loadEvent + +
+           
+  +

+ + + + + + + + + +
Methods in jrummikub.control that return types with arguments of type GameState
+ IEvent3<GameSettings,GameState,IRoundState>SaveControl.getLoadEvent() + +
+          Getter for loadEvent
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.control with parameters of type GameState
+ voidGameControl.continueGame(GameState gameState, + IRoundState roundState) + +
+          Continues game after loading
+ voidSaveControl.setGameState(GameState gameState) + +
+          Sets the current game state
+  +

+ + + + + +
+Uses of GameState in jrummikub.model
+  +

+ + + + + + + + + +
Fields in jrummikub.model declared as GameState
+private  GameStateRoundState.gameState + +
+           
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.model that return GameState
+ GameStateIRoundState.getGameState() + +
+          Returns the game state
+ GameStateRoundState.getGameState() + +
+           
+  +

+ + + + + + + + +
Constructors in jrummikub.model with parameters of type GameState
RoundState(GameSettings gameSettings, + GameState gameState) + +
+          Create a new RoundState with an empty table


diff --git a/doc/jrummikub/model/class-use/Hand.html b/doc/jrummikub/model/class-use/Hand.html index a0a5082..4a8afb4 100644 --- a/doc/jrummikub/model/class-use/Hand.html +++ b/doc/jrummikub/model/class-use/Hand.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.Hand - + diff --git a/doc/jrummikub/model/class-use/IHand.html b/doc/jrummikub/model/class-use/IHand.html index 70e4ca9..66060e7 100644 --- a/doc/jrummikub/model/class-use/IHand.html +++ b/doc/jrummikub/model/class-use/IHand.html @@ -2,12 +2,12 @@ - + Uses of Interface jrummikub.model.IHand - + @@ -90,7 +90,7 @@ function windowTitle() Packages that use IHand -jrummikub.control +jrummikub.control.turn    @@ -100,11 +100,11 @@ Packages that use + +Uses of IHand in jrummikub.control.turn
-Uses of IHand in jrummikub.control
  @@ -112,25 +112,47 @@ Uses of -Constructors in jrummikub.control with parameters of type IHand +Fields in jrummikub.control.turn declared as IHand -TurnControl(IHand hand, - ITable table, - IView view) + +private  IHand +ITurnControl.TurnInfo.hand + +
+            + + + +private  IHand +ITurnControl.TurnInfo.oldHand + +
+            + + +  +

+ + + + + + + + +          Gets the current player's hand - + +          Gets the current player's hand at the beginning of the turn
Methods in jrummikub.control.turn that return IHand
+ IHandITurnControl.TurnInfo.getHand()
-          Create a new TurnControl using a given hand (of the active player), a given - table and a given view for user interaction.
TurnControl(IHand hand, - ITable table, - IView view, - ITurnTimer testTimer) + + IHandITurnControl.TurnInfo.getOldHand()
-          Test only constructor
  @@ -163,16 +185,24 @@ Uses of -Methods in jrummikub.model that return IHand +Fields in jrummikub.model declared as IHand - IHand -Player.getHand() +private  IHand +Player.hand
            + +  +

+ + + + + @@ -181,6 +211,38 @@ Uses of + + + +
Methods in jrummikub.model that return IHand
 IHand + IHandPlayer.getHand() + +
+           
+  +

+ + + + + + + + + + + + +
Methods in jrummikub.model with parameters of type IHand
+ voidIPlayer.setHand(IHand hand) + +
+          Set the current hand of the player
+ voidPlayer.setHand(IHand hand) + +
+           
 

diff --git a/doc/jrummikub/model/class-use/IPlayer.html b/doc/jrummikub/model/class-use/IPlayer.html index 9c4cd54..98672ce 100644 --- a/doc/jrummikub/model/class-use/IPlayer.html +++ b/doc/jrummikub/model/class-use/IPlayer.html @@ -2,12 +2,12 @@ - + Uses of Interface jrummikub.model.IPlayer - + @@ -93,6 +93,14 @@ Packages that use jrummikub.model    + +jrummikub.view +   + + +jrummikub.view.impl +   +  

@@ -122,6 +130,22 @@ Uses of + +Fields in jrummikub.model declared as IPlayer + + + +private  IPlayer +RoundState.lastPlayer + +
+            + + +  +

+ @@ -129,7 +153,15 @@ Uses of - + + + + @@ -137,15 +169,16 @@ Uses of - +          Sets the player that will make the last turn before the round ends when the + heap is empty - @@ -153,11 +186,156 @@ Uses of - + + + + + + + + + + + + +
Methods in jrummikub.model that return IPlayer  IPlayerGameState.getActivePlayer() +IRoundState.getActivePlayer() + +
+          Returns the currently active player
+ IPlayerRoundState.getActivePlayer()
           
 IPlayerIGameState.getActivePlayer() +IRoundState.getLastPlayer()
-          Returns the currently active player
 IPlayerGameState.getNthNextPlayer(int i) +RoundState.getLastPlayer()
           
 IPlayerIGameState.getNthNextPlayer(int i) +IRoundState.getNthNextPlayer(int i)
          Returns the player that would be the active player after i turns
+ IPlayerRoundState.getNthNextPlayer(int i) + +
+           
+ IPlayerIRoundState.getNthPlayer(int i) + +
+          Returns the nth player
+ IPlayerRoundState.getNthPlayer(int i) + +
+           
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.model with parameters of type IPlayer
+ voidIRoundState.setLastPlayer(IPlayer lastPlayer) + +
+          Gets the player that will make the last turn before the round ends when the + heap is empty
+ voidRoundState.setLastPlayer(IPlayer lastPlayer) + +
+           
+  +

+ + + + + +
+Uses of IPlayer in jrummikub.view
+  +

+ + + + + + + + + +
Method parameters in jrummikub.view with type arguments of type IPlayer
+ voidISidePanel.setPlayers(java.util.List<IPlayer> players) + +
+          Sets the player information in order of turns
+  +

+ + + + + +
+Uses of IPlayer in jrummikub.view.impl
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.view.impl with parameters of type IPlayer
+private  voidSidePanel.PlayerListItem.addHandSizeInfo(IPlayer player) + +
+           
+private  voidSidePanel.PlayerListItem.addLastTurnInfo(IPlayer player) + +
+           
+  +

+ + + + + + + + + + + + + +
Method parameters in jrummikub.view.impl with type arguments of type IPlayer
+ voidSidePanel.setPlayers(java.util.List<IPlayer> players) + +
+           
+(package private)  voidSidePanel.PlayerListPanel.setPlayers(java.util.List<IPlayer> players) + +
+           
+  +

+ + + + + + + +
Constructors in jrummikub.view.impl with parameters of type IPlayer
SidePanel.PlayerListItem(IPlayer player) + +
+           
 

diff --git a/doc/jrummikub/model/class-use/IStoneTray.html b/doc/jrummikub/model/class-use/IStoneTray.html index dc1e289..55c0d83 100644 --- a/doc/jrummikub/model/class-use/IStoneTray.html +++ b/doc/jrummikub/model/class-use/IStoneTray.html @@ -2,12 +2,12 @@ - + Uses of Interface jrummikub.model.IStoneTray - + diff --git a/doc/jrummikub/model/class-use/ITable.html b/doc/jrummikub/model/class-use/ITable.html index f3a4745..fb3ec20 100644 --- a/doc/jrummikub/model/class-use/ITable.html +++ b/doc/jrummikub/model/class-use/ITable.html @@ -2,12 +2,12 @@ - + Uses of Interface jrummikub.model.ITable - + @@ -94,6 +94,14 @@ Packages that use +jrummikub.control.network +   + + +jrummikub.control.turn +   + + jrummikub.model    @@ -112,13 +120,12 @@ Uses of -Methods in jrummikub.control with parameters of type ITable +Fields in jrummikub.control declared as ITable -(package private) static java.util.Set<Stone> -RoundControl.tableDifference(ITable oldTable, - ITable newTable) +private  ITable +RoundControl.InvalidTurnInfo.table
            @@ -127,27 +134,229 @@ Uses of + +Methods in jrummikub.control that return ITable + + + + ITable +RoundControl.InvalidTurnInfo.getTable() + +
+          Getter for table + + +  +

+ - + +
Constructors in jrummikub.control with parameters of type ITable
TurnControl(IHand hand, - ITable table, - IView view) +RoundControl.InvalidTurnInfo(ITable table, + RoundControl.InvalidTurnType type, + java.util.Collection<StoneSet> invalidSets) + +
+          Creates new InvalidTurnInfo
+  +

+ + + + + +
+Uses of ITable in jrummikub.control.network
+  +

+ + + + + + + + + +
Fields in jrummikub.control.network with type parameters of type ITable
+private  Event1<ITable>ConnectionControl.tableUpdateEvent + +
+           
+  +

+ + + + + + + + +            - + +            + +
Methods in jrummikub.control.network that return types with arguments of type ITable
+ IEvent1<ITable>ConnectionControl.getTableUpdateEvent()
-          Create a new TurnControl using a given hand (of the active player), a given - table and a given view for user interaction.
TurnControl(IHand hand, - ITable table, - IView view, - ITurnTimer testTimer) + + IEvent1<ITable>IConnectionControl.getTableUpdateEvent()
-          Test only constructor
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.control.network with parameters of type ITable
+ voidConnectionControl.updateTable(ITable table) + +
+           
+ voidIConnectionControl.updateTable(ITable table) + +
+           
+  +

+ + + + + +
+Uses of ITable in jrummikub.control.turn
+  +

+ + + + + + + + + + + + + +
Fields in jrummikub.control.turn declared as ITable
+private  ITableITurnControl.TurnInfo.oldTable + +
+           
+private  ITableITurnControl.TurnInfo.table + +
+           
+  +

+ + + + + + + + + +
Fields in jrummikub.control.turn with type parameters of type ITable
+protected  Event1<ITable>AbstractTurnControl.tableUpdateEvent + +
+           
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.control.turn that return ITable
+ ITableITurnControl.TurnInfo.getOldTable() + +
+          Gets the table at the beginning of the turn
+ ITableITurnControl.TurnInfo.getTable() + +
+          Gets the current table
+  +

+ + + + + + + + + + + + + +
Methods in jrummikub.control.turn that return types with arguments of type ITable
+ IEvent1<ITable>AbstractTurnControl.getTableUpdateEvent() + +
+           
+ IEvent1<ITable>ITurnControl.getTableUpdateEvent() + +
+          Emitted in network when the table changes during player turn
+  +

+ + + + + + + + + + + +
Methods in jrummikub.control.turn with parameters of type ITable
+(package private) static java.util.Set<Stone>AbstractTurnControl.tableDifference(ITable oldTable, + ITable newTable) + +
+           
+(package private) static java.util.List<StoneSet>AbstractTurnControl.tableSetDifference(ITable oldTable, + ITable newTable) + +
+           
  @@ -180,24 +389,40 @@ Uses of -Methods in jrummikub.model that return ITable +Fields in jrummikub.model declared as ITable - ITable -GameState.getTable() +private  ITable +RoundState.table
            + +  +

+ + + + + - + + + +
Methods in jrummikub.model that return ITable
 ITableIGameState.getTable() +IRoundState.getTable()
          Get the current Table
+ ITableRoundState.getTable() + +
+           
 

@@ -209,18 +434,18 @@ Uses of  void -GameState.setTable(ITable table) +IRoundState.setTable(ITable table)
-            +          Sets the current Table  void -IGameState.setTable(ITable table) +RoundState.setTable(ITable table)
-          Sets the current Table +              diff --git a/doc/jrummikub/model/class-use/Player.html b/doc/jrummikub/model/class-use/Player.html index 247668f..fdff2f3 100644 --- a/doc/jrummikub/model/class-use/Player.html +++ b/doc/jrummikub/model/class-use/Player.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.Player - + @@ -83,7 +83,43 @@ function windowTitle()

Uses of Class
jrummikub.model.Player

-No usage of jrummikub.model.Player + + + + + + + + + +
+Packages that use Player
jrummikub.model  
+  +

+ + + + + +
+Uses of Player in jrummikub.model
+  +

+ + + + + + + + + +
Fields in jrummikub.model with type parameters of type Player
+private  java.util.ArrayList<Player>RoundState.players + +
+           


diff --git a/doc/jrummikub/model/class-use/Position.html b/doc/jrummikub/model/class-use/Position.html index 23071cd..648df09 100644 --- a/doc/jrummikub/model/class-use/Position.html +++ b/doc/jrummikub/model/class-use/Position.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.Position - + @@ -90,7 +90,7 @@ function windowTitle() Packages that use Position -jrummikub.control +jrummikub.control.turn    @@ -108,11 +108,11 @@ Packages that use + +Uses of Position in jrummikub.control.turn
-Uses of Position in jrummikub.control
  @@ -120,12 +120,36 @@ Uses of -Method parameters in jrummikub.control with type arguments of type Position +Methods in jrummikub.control.turn with parameters of type Position + + + +private  void +HumanTurnControl.handClick(Position pos) + +
+            + + + +private  void +HumanTurnControl.tableClick(Position position) + +
+            + + +  +

+ + + + - - + + + + + + +
Method parameters in jrummikub.control.turn with type arguments of type Position
 intTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, +HumanTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, Pair<Stone,Position> pair2)
@@ -134,7 +158,7 @@ Uses of
 intTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, +HumanTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, Pair<Stone,Position> pair2)
@@ -153,6 +177,22 @@ Uses of +
Fields in jrummikub.model declared as Position
+(package private)  PositionTable.StoneInfo.setPosition + +
+           
+  +

+ @@ -175,6 +215,18 @@ Uses of + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fields in jrummikub.model with type parameters of type Position +private  PositionStoneTray.getNewPosition(E object, + Position position, + StoneTray.Direction newDirection, + E currentObject, + Position currentPosition) + +
+           
 Position StoneTray.getPosition(E object) @@ -254,6 +306,27 @@ Uses of +private  voidStoneTray.drop(E object, + Position position, + StoneTray.Direction direction) + +
+          Subroutine to "drop" to consider and determine the direction the objects + dropped one collides with position-wise evade in
+private  voidStoneTray.dropUnchecked(E object, + Position position, + StoneTray.Direction direction) + +
+          Subroutine to "drop" to execute the actual drop
protected  Pair<Position,StoneTray.Direction> StoneTray.fixInvalidDrop(E object, Position pos, @@ -270,6 +343,103 @@ Uses of Position pos, StoneTray.Direction dir) +
+           
+private  StoneTray.DirectionStoneTray.getMoveDirection(E object, + Position position, + Pair<E,Position> blocking) + +
+          Returns the direction to move the object in
+private  booleanStoneTray.getMoveOrientation(E object, + Position position, + Pair<E,Position> blocking) + +
+          Will the object be moved horizontally or vertically
+private  PositionStoneTray.getNewPosition(E object, + Position position, + StoneTray.Direction newDirection, + E currentObject, + Position currentPosition) + +
+           
+private  booleanStoneTray.objectsOverlap(E object1, + Position position1, + E object2, + Position position2) + +
+          Tests whether two objects overlap
+private  voidTable.splitSet(StoneSet set, + Position setPosition, + int stonePosition) + +
+          Splits a stone set at a specified position
+  +

+ + + + + + + + + + + + + +
Method parameters in jrummikub.model with type arguments of type Position
+private  StoneTray.DirectionStoneTray.getMoveDirection(E object, + Position position, + Pair<E,Position> blocking) + +
+          Returns the direction to move the object in
+private  booleanStoneTray.getMoveOrientation(E object, + Position position, + Pair<E,Position> blocking) + +
+          Will the object be moved horizontally or vertically
+  +

+ + + + + + + @@ -335,13 +505,53 @@ Uses of + + + + + + + + + + + + + + + + + + + +
Constructors in jrummikub.model with parameters of type Position
Table.StoneInfo(StoneSet set, + Position setPosition, + int stonePosition) +
           
Fields in jrummikub.view.impl with type parameters of type Position
+private  Event1<Position>AbstractStonePanel.clickEvent + +
+           
+private  java.util.List<Pair<StoneSet,Position>>TablePanel.pauseStoneSets + +
+           
+private  java.lang.Iterable<Pair<Stone,Position>>AbstractStonePanel.stones + +
+           
+private  java.lang.Iterable<Pair<StoneSet,Position>>TablePanel.stoneSets + +
+           
+  +

+ +(package private)  Position + + + + - + +          Gets the stone at the specified position - + +          Overwrite this method to signal if special zone was clicked - + + + + + + + + +
Methods in jrummikub.view.impl that return Position
- Position StonePainter.calculatePosition(int x, int y) @@ -358,6 +568,14 @@ Uses of +private  java.util.List<Pair<Stone,Position>>View.createDecorationStones() + +
+           
 Event1<Position> AbstractStonePanel.getClickEvent() @@ -382,11 +600,11 @@ Uses of -protected  booleanAbstractStonePanel.handleOtherClickEvent(Position pos) +private  StoneAbstractStonePanel.getStoneAt(Position pos)
-          Overwrite this method to signal if special zone was clicked
@@ -406,11 +624,11 @@ Uses of -protected  voidAbstractStonePanel.handleOtherMoveEvent(Position pos) +protected  booleanAbstractStonePanel.handleOtherClickEvent(Position pos)
-          Overwrite this method to signal if special zone was hovered
@@ -422,16 +640,36 @@ Uses of - voidStonePainter.paintStone(java.awt.Graphics2D g, +protected  voidAbstractStonePanel.handleOtherMoveEvent(Position pos) + +
+          Overwrite this method to signal if special zone was hovered
+(package private)  voidStonePainter.paintStone(java.awt.Graphics2D g, Stone stone, Position p, - boolean selected, + StonePainter.StoneState state, boolean hovered)
          Paints a stone
+private  voidTablePanel.paintStoneSet(java.awt.Graphics2D g, + StoneSet stoneSet, + Position pos, + java.awt.geom.Area connectorArea, + java.awt.geom.Area hoveredConnectorArea) + +
+           
 

@@ -442,19 +680,19 @@ Uses of -protected  void -AbstractStonePanel.setStones(java.lang.Iterable<Pair<Stone,Position>> stones) + void +HandPanel.setStones(java.lang.Iterable<Pair<Stone,Position>> stones)
-          Sets the list of stones that can be clicked on +            - void -HandPanel.setStones(java.lang.Iterable<Pair<Stone,Position>> stones) +protected  void +AbstractStonePanel.setStones(java.lang.Iterable<Pair<Stone,Position>> stones)
-            +          Sets the list of stones that can be clicked on diff --git a/doc/jrummikub/model/class-use/Sizeable.html b/doc/jrummikub/model/class-use/Sizeable.html index f3092e7..742048b 100644 --- a/doc/jrummikub/model/class-use/Sizeable.html +++ b/doc/jrummikub/model/class-use/Sizeable.html @@ -2,12 +2,12 @@ - + Uses of Interface jrummikub.model.Sizeable - + diff --git a/doc/jrummikub/model/class-use/Stone.html b/doc/jrummikub/model/class-use/Stone.html index 0e84e0a..100ed98 100644 --- a/doc/jrummikub/model/class-use/Stone.html +++ b/doc/jrummikub/model/class-use/Stone.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.Stone - + @@ -90,7 +90,11 @@ function windowTitle() Packages that use Stone -jrummikub.control +jrummikub.ai +   + + +jrummikub.control.turn    @@ -108,11 +112,11 @@ Packages that use + +Uses of Stone in jrummikub.ai
-Uses of Stone in jrummikub.control
  @@ -120,12 +124,93 @@ Uses of -Methods in jrummikub.control that return types with arguments of type Stone +Fields in jrummikub.ai with type parameters of type Stone + + + +private  java.util.List<Stone> +TurnLogic.inputStones + +
+            + + +  +

+ + + + + + + + +
Constructors in jrummikub.ai with parameters of type Stone
TurnLogic.StoneState(int id, + Stone stone, + boolean table) + +
+          Creates a new
+  +

+ + + + + + + + + + + +
Constructor parameters in jrummikub.ai with type arguments of type Stone
TurnLogic(GameSettings settings, + java.util.Collection<Stone> tableStones, + java.util.Collection<Stone> handStones) + +
+          Creates new turn logic
TurnLogic(GameSettings settings, + java.util.Collection<Stone> tableStones, + java.util.Collection<Stone> handStones) + +
+          Creates new turn logic
+  +

+ + + + + +
+Uses of Stone in jrummikub.control.turn
+  +

+ + + + + + + + + +
Fields in jrummikub.control.turn with type parameters of type Stone
+private  java.util.List<Stone>HumanTurnControl.selectedStones + +
+           
+  +

+ + + + - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Methods in jrummikub.control.turn that return types with arguments of type Stone
(package private) static java.util.Set<Stone>RoundControl.tableDifference(ITable oldTable, +AbstractTurnControl.tableDifference(ITable oldTable, ITable newTable)
@@ -137,12 +222,135 @@ Uses of
Method parameters in jrummikub.control with type arguments of type StoneMethods in jrummikub.control.turn with parameters of type Stone
+private  voidHumanTurnControl.collectionSetClick(Stone stone, + boolean collect) + +
+           
+private  voidHumanTurnControl.collectionStoneClick(Stone stone, + boolean collect) + +
+           
 intTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, +HumanTurnControl.RunComparator.compare(Stone s1, + Stone s2) + +
+           
+ intHumanTurnControl.GroupComparator.compare(Stone s1, + Stone s2) + +
+           
+private static intHumanTurnControl.compareColors(Stone s1, + Stone s2) + +
+           
+private static intHumanTurnControl.compareJokers(Stone s1, + Stone s2) + +
+           
+private static intHumanTurnControl.compareValues(Stone s1, + Stone s2) + +
+           
+private  voidHumanTurnControl.handRangeClick(Stone stone, + boolean collect) + +
+           
+private  voidHumanTurnControl.stoneClick(Stone stone, + boolean collect) + +
+           
+private  voidHumanTurnControl.tableRangeClick(Stone stone, + boolean collect) + +
+           
+private  voidHumanTurnControl.tableSetClick(Stone stone, + boolean collect) + +
+           
+  +

+ + + + + + + + + + + + + + + + - + + + + @@ -176,9 +392,17 @@ Uses of +(package private)  java.util.ArrayList<Stone> + + + + @@ -240,6 +464,14 @@ Uses of + + + + + + + + + + + + + + +
Method parameters in jrummikub.control.turn with type arguments of type Stone
+private  voidAIControl.addHandStones(java.util.List<Stone> handStones) + +
+           
+private  voidAIControl.addTableStones(java.util.List<Stone> tableStones) + +
+           
+ intHumanTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, Pair<Stone,Position> pair2)
@@ -151,9 +359,17 @@ Uses of
 intTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, +HumanTurnControl.HandStonePositionComparator.compare(Pair<Stone,Position> pair1, Pair<Stone,Position> pair2) +
+           
+private  voidHumanTurnControl.sortStones(java.util.Comparator<Stone> comparator) +
           
-(package private)  java.util.List<Stone> StoneHeap.heap +
+           
+private  java.util.ArrayList<Stone>StoneSet.stones +
           
+private  Table.StoneInfoTable.findStoneInfo(Stone stone) + +
+          Finds Table.StoneInfo
 StoneSet Table.findStoneSet(Stone stone) @@ -290,6 +522,14 @@ Uses of +private static Pair<java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer>,java.lang.Integer>Hand.countStones(java.util.List<Stone> stones) + +
+          Counts the numbers of stones
 void StoneHeap.putBack(java.util.Collection<Stone> stones) @@ -348,7 +588,7 @@ Uses of @@ -357,7 +597,7 @@ Uses of @@ -404,6 +644,86 @@ Uses of +
Fields in jrummikub.view.impl declared as Stone
+private  StoneAbstractStonePanel.hoveredStone + +
+           
+  +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Fields in jrummikub.view.impl with type parameters of type Stone
+private  Event2<Stone,java.lang.Boolean>AbstractStonePanel.rangeClickEvent + +
+           
+private  java.util.Collection<Stone>StoneCollectionPanel.selectedStones + +
+           
+private  java.util.Collection<Stone>HandPanel.selectedStones + +
+           
+private  java.util.Collection<Stone>TablePanel.selectedStones + +
+           
+private  Event2<Stone,java.lang.Boolean>AbstractStonePanel.setClickEvent + +
+           
+private  Event2<Stone,java.lang.Boolean>AbstractStonePanel.stoneClickEvent + +
+           
+private  java.lang.Iterable<Pair<Stone,Position>>AbstractStonePanel.stones + +
+           
+  +

+ @@ -416,6 +736,14 @@ Uses of + + +
Methods in jrummikub.view.impl that return Stone +private  StoneAbstractStonePanel.getStoneAt(Position pos) + +
+          Gets the stone at the specified position
 

@@ -426,6 +754,14 @@ Uses of +private  java.util.List<Pair<Stone,Position>> +View.createDecorationStones() + +
+            + + +  Event2<Stone,java.lang.Boolean> AbstractStonePanel.getRangeClickEvent() @@ -466,16 +802,24 @@ Uses of - void -StonePainter.paintStone(java.awt.Graphics2D g, +(package private)  void +StonePainter.paintStone(java.awt.Graphics2D g, Stone stone, Position p, - boolean selected, + StonePainter.StoneState state, boolean hovered)
          Paints a stone + + +private  void +AbstractStonePanel.setHoveredStone(Stone stone) + +
+          Sets the stone over which the cursor hovers +  

@@ -486,14 +830,6 @@ Uses of - void -View.setSelectedStones(java.util.Collection<Stone> stones) - -
-            - - - (package private)  void StoneCollectionPanel.setSelectedStones(java.util.Collection<Stone> selectedStones) @@ -518,11 +854,11 @@ Uses of -protected  void -AbstractStonePanel.setStones(java.lang.Iterable<Pair<Stone,Position>> stones) + void +View.setSelectedStones(java.util.Collection<Stone> stones)
-          Sets the list of stones that can be clicked on +            @@ -532,6 +868,14 @@ Uses of + +protected  void +AbstractStonePanel.setStones(java.lang.Iterable<Pair<Stone,Position>> stones) + +
+          Sets the list of stones that can be clicked on +  

diff --git a/doc/jrummikub/model/class-use/StoneColor.html b/doc/jrummikub/model/class-use/StoneColor.html index 9333b62..315c5e8 100644 --- a/doc/jrummikub/model/class-use/StoneColor.html +++ b/doc/jrummikub/model/class-use/StoneColor.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.StoneColor - + @@ -90,9 +90,78 @@ function windowTitle() Packages that use StoneColor +jrummikub.ai +   + + jrummikub.model    + +jrummikub.view +   + + +jrummikub.view.impl +   + + +  +

+ + + + + +
+Uses of StoneColor in jrummikub.ai
+  +

+ + + + + + + + + + + + + + + + + +
Fields in jrummikub.ai declared as StoneColor
+(package private)  StoneColorTurnLogic.StoneState.color + +
+           
+private  StoneColorTurnLogic.maxColor + +
+           
+private  StoneColorTurnLogic.minColor + +
+           
+  +

+ + + + + + + + +
Fields in jrummikub.ai with type parameters of type StoneColor
+private  java.util.ArrayList<StoneColor>TurnLogic.stoneColors + +
+           
 

@@ -106,6 +175,46 @@ Uses of + +Fields in jrummikub.model declared as StoneColor + + + +private  StoneColor +Stone.color + +
+            + + +  +

+ + + + + + + + + + + + + +
Fields in jrummikub.model with type parameters of type StoneColor
+private static java.util.Comparator<Pair<java.lang.Integer,StoneColor>>Hand.comparator + +
+          The measure to compare the stones by
+private  java.util.HashSet<StoneColor>GameSettings.stoneColors + +
+           
+  +

+ @@ -139,6 +248,64 @@ the order they are declared.  

+

Methods in jrummikub.model that return StoneColor
+ + + + + + + + + + + +
Methods in jrummikub.model that return types with arguments of type StoneColor
+private static Pair<java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer>,java.lang.Integer>Hand.countStones(java.util.List<Stone> stones) + +
+          Counts the numbers of stones
+ java.util.Set<StoneColor>GameSettings.getStoneColors() + +
+          Get stone colors used
+  +

+ + + + + + + + + + + + + + + + + +
Method parameters in jrummikub.model with type arguments of type StoneColor
+private static voidHand.incrementStoneCount(java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer> stones, + Pair<java.lang.Integer,StoneColor> stone) + +
+          Increments the count of a stone in the list of all stones
+private static voidHand.incrementStoneCount(java.util.TreeMap<Pair<java.lang.Integer,StoneColor>,java.lang.Integer> stones, + Pair<java.lang.Integer,StoneColor> stone) + +
+          Increments the count of a stone in the list of all stones
+ voidGameSettings.setStoneColors(java.util.Set<StoneColor> stoneColors) + +
+          Set stone colors used
+  +

+ @@ -159,6 +326,132 @@ the order they are declared.
Constructors in jrummikub.model with parameters of type StoneColor
 

+ + + + + +
+Uses of StoneColor in jrummikub.view
+  +

+ + + + + + + + + +
Methods in jrummikub.view that return types with arguments of type StoneColor
+ IEvent1<java.util.Set<StoneColor>>ISettingsPanel.getChangeStoneColorsEvent() + +
+          The change Stone colors event is emitted when the user chooses the stone + colors to play with.
+  +

+ + + + + +
+Uses of StoneColor in jrummikub.view.impl
+  +

+ + + + + + + + + + + + + + + + + + + + + +
Fields in jrummikub.view.impl with type parameters of type StoneColor
+private  Event1<java.util.Set<StoneColor>>SettingsPanel.changeStoneColorsEvent + +
+           
+private  java.util.Map<StoneColor,javax.swing.JToggleButton>SettingsPanel.colorButtons + +
+           
+private  java.util.Map<StonePainter.StoneState,java.util.Map<StoneColor,java.util.Map<java.lang.Integer,java.awt.image.BufferedImage>>>StonePainter.defaultStones + +
+           
+private  java.util.Map<StonePainter.StoneState,java.util.Map<StoneColor,java.util.Map<java.lang.Integer,java.awt.image.BufferedImage>>>StonePainter.hoveredStones + +
+           
+  +

+ + + + + + + + + +
Methods in jrummikub.view.impl that return types with arguments of type StoneColor
+ IEvent1<java.util.Set<StoneColor>>SettingsPanel.getChangeStoneColorsEvent() + +
+           
+  +

+ + + + + + + + + + + + + + + + + +
Methods in jrummikub.view.impl with parameters of type StoneColor
+private  voidSettingsPanel.createColorButton(StoneColor color) + +
+           
+(package private) static java.awt.ColorStonePainter.getColor(StoneColor color) + +
+           
+private  java.awt.image.BufferedImageStonePainter.getStoneImage(StoneColor color, + int value, + StonePainter.StoneState state, + boolean hovered) + +
+           
+  +


diff --git a/doc/jrummikub/model/class-use/StoneHeap.html b/doc/jrummikub/model/class-use/StoneHeap.html index d1751c1..55975f5 100644 --- a/doc/jrummikub/model/class-use/StoneHeap.html +++ b/doc/jrummikub/model/class-use/StoneHeap.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.StoneHeap - + @@ -108,24 +108,40 @@ Uses of -Methods in jrummikub.model that return StoneHeap +Fields in jrummikub.model declared as StoneHeap - StoneHeap -GameState.getGameHeap() +private  StoneHeap +RoundState.stoneHeap
            + +  +

+ + + + + - + + + +
Methods in jrummikub.model that return StoneHeap
 StoneHeapIGameState.getGameHeap() +IRoundState.getStoneHeap()
          Returns the heap of stones to draw from
+ StoneHeapRoundState.getStoneHeap() + +
+           
 

diff --git a/doc/jrummikub/model/class-use/StoneSet.Type.html b/doc/jrummikub/model/class-use/StoneSet.Type.html index 1b74fef..729b68e 100644 --- a/doc/jrummikub/model/class-use/StoneSet.Type.html +++ b/doc/jrummikub/model/class-use/StoneSet.Type.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.StoneSet.Type - + @@ -112,15 +112,6 @@ Uses of - StoneSet.Type -StoneSet.classify() - -
-          Test for rule conflict within the StoneSet and determine whether the set - is a group or a run - - - static StoneSet.Type StoneSet.Type.valueOf(java.lang.String name) @@ -139,6 +130,32 @@ the order they are declared.  

+ + + + + + + + + + + + + +
Methods in jrummikub.model that return types with arguments of type StoneSet.Type
+ Pair<StoneSet.Type,java.lang.Integer>StoneSet.classify(GameSettings settings) + +
+          Test for rule conflict within the StoneSet and determine whether the set is + a group or a run
+private  Pair<StoneSet.Type,java.lang.Integer>StoneSet.classifyJokersOnly(GameSettings settings) + +
+          Test for rule conflict within a StoneSet with jokers only and determine + whether the set is a group or a run
+  +


diff --git a/doc/jrummikub/model/class-use/StoneSet.html b/doc/jrummikub/model/class-use/StoneSet.html index ed2b6a5..82ccfa3 100644 --- a/doc/jrummikub/model/class-use/StoneSet.html +++ b/doc/jrummikub/model/class-use/StoneSet.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.StoneSet - + @@ -90,6 +90,18 @@ function windowTitle() Packages that use StoneSet +jrummikub.ai +   + + +jrummikub.control +   + + +jrummikub.control.turn +   + + jrummikub.model    @@ -104,6 +116,163 @@ Packages that use + + + + +
+Uses of StoneSet in jrummikub.ai
+  +

+ + + + + + + + + +
Methods in jrummikub.ai that return types with arguments of type StoneSet
+ java.util.List<StoneSet>TurnLogic.getResult() + +
+          Get the found stones and create output sets
+  +

+ + + + + +
+Uses of StoneSet in jrummikub.control
+  +

+ + + + + + + + + +
Fields in jrummikub.control with type parameters of type StoneSet
+private  java.util.ArrayList<StoneSet>RoundControl.InvalidTurnInfo.invalidSets + +
+           
+  +

+ + + + + + + + + +
Methods in jrummikub.control that return types with arguments of type StoneSet
+ java.util.List<StoneSet>RoundControl.InvalidTurnInfo.getInvalidSets() + +
+          Getter for the invalid sets
+  +

+ + + + + + + + +
Constructor parameters in jrummikub.control with type arguments of type StoneSet
RoundControl.InvalidTurnInfo(ITable table, + RoundControl.InvalidTurnType type, + java.util.Collection<StoneSet> invalidSets) + +
+          Creates new InvalidTurnInfo
+  +

+ + + + + +
+Uses of StoneSet in jrummikub.control.turn
+  +

+ + + + + + + + + + + + + + + + + +
Methods in jrummikub.control.turn that return types with arguments of type StoneSet
+private  java.util.List<StoneSet>AbstractTurnControl.invalidStoneSets() + +
+           
+(package private) static java.util.List<StoneSet>AbstractTurnControl.tableSetDifference(ITable oldTable, + ITable newTable) + +
+           
+private  java.util.List<StoneSet>AbstractTurnControl.touchedStoneSets() + +
+           
+  +

+ + + + + + + + + +
Methods in jrummikub.control.turn with parameters of type StoneSet
+private  voidHumanTurnControl.connectorClick(StoneSet set, + boolean right) + +
+           
+  +

+ + + + + + + + + +
Method parameters in jrummikub.control.turn with type arguments of type StoneSet
+private  voidAIControl.doNotMoveExistingSets(java.util.List<StoneSet> result) + +
+           
+  +

@@ -114,6 +283,22 @@ Uses of + + + + + + + +
Fields in jrummikub.model declared as StoneSet
+(package private)  StoneSetTable.StoneInfo.set + +
+           
+  +

+ @@ -184,6 +369,32 @@ Uses of + + + +
Methods in jrummikub.model that return StoneSet +private  voidTable.splitSet(StoneSet set, + Position setPosition, + int stonePosition) + +
+          Splits a stone set at a specified position
+  +

+ + + + + + + +
Constructors in jrummikub.model with parameters of type StoneSet
Table.StoneInfo(StoneSet set, + Position setPosition, + int stonePosition) + +
+           
 

@@ -230,6 +441,14 @@ Uses of  void +IView.setInvalidStoneSets(java.util.Collection<StoneSet> sets) + +
+          Set invalid sets to enable showing + + + + void ITablePanel.setStoneSets(java.lang.Iterable<Pair<StoneSet,Position>> stoneSets)
@@ -248,6 +467,78 @@ Uses of + +Fields in jrummikub.view.impl declared as StoneSet + + + +private  StoneSet +TablePanel.leftHoveredConnector + +
+            + + + +private  StoneSet +TablePanel.rightHoveredConnector + +
+            + + +  +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Fields in jrummikub.view.impl with type parameters of type StoneSet
+private  java.util.Collection<StoneSet>TablePanel.invalidStoneSets + +
+           
+private  Event1<StoneSet>TablePanel.leftConnectorClickEvent + +
+           
+private  java.util.List<Pair<StoneSet,Position>>TablePanel.pauseStoneSets + +
+           
+private  Event1<StoneSet>TablePanel.rightConnectorClickEvent + +
+           
+private  java.lang.Iterable<Pair<StoneSet,Position>>TablePanel.stoneSets + +
+           
+  +

+ @@ -272,12 +563,48 @@ Uses of + + + + + + + +
Methods in jrummikub.view.impl that return types with arguments of type StoneSet
Methods in jrummikub.view.impl with parameters of type StoneSet
+private  voidTablePanel.paintStoneSet(java.awt.Graphics2D g, + StoneSet stoneSet, + Position pos, + java.awt.geom.Area connectorArea, + java.awt.geom.Area hoveredConnectorArea) + +
+           
+  +

+ + + + + + + + + + + + + + + + + + + + +Position pos, StoneTray.Direction dir) +
+            + + + + diff --git a/doc/jrummikub/model/class-use/StoneTray.html b/doc/jrummikub/model/class-use/StoneTray.html index a6a0e9b..802e8db 100644 --- a/doc/jrummikub/model/class-use/StoneTray.html +++ b/doc/jrummikub/model/class-use/StoneTray.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.StoneTray - + diff --git a/doc/jrummikub/model/class-use/Table.html b/doc/jrummikub/model/class-use/Table.html index 05e997e..bc4dba3 100644 --- a/doc/jrummikub/model/class-use/Table.html +++ b/doc/jrummikub/model/class-use/Table.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.Table - + diff --git a/doc/jrummikub/model/package-frame.html b/doc/jrummikub/model/package-frame.html index cf1f069..2d62dc5 100644 --- a/doc/jrummikub/model/package-frame.html +++ b/doc/jrummikub/model/package-frame.html @@ -2,12 +2,12 @@ - + jrummikub.model - + @@ -23,12 +23,12 @@ jrummikub.model Interfaces 
-IGameState -
IHand
IPlayer
+IRoundState +
IStoneTray
ITable @@ -44,14 +44,22 @@ Interfaces
  Classes 
+GameSettings +
GameState
Hand
Player
+PlayerSettings +
Position
+RoundState +
+Score +
Stone
StoneHeap @@ -60,7 +68,9 @@ Classes
 
StoneTray
-Table +Table +
+Table.StoneInfo
Method parameters in jrummikub.view.impl with type arguments of type StoneSet
+(package private)  voidTablePanel.setInvalidStoneSets(java.util.Collection<StoneSet> sets) + +
+           
+ voidView.setInvalidStoneSets(java.util.Collection<StoneSet> sets) + +
+           
 void TablePanel.setStoneSets(java.lang.Iterable<Pair<StoneSet,Position>> stoneSets) diff --git a/doc/jrummikub/model/class-use/StoneTray.Direction.html b/doc/jrummikub/model/class-use/StoneTray.Direction.html index a653204..d01447b 100644 --- a/doc/jrummikub/model/class-use/StoneTray.Direction.html +++ b/doc/jrummikub/model/class-use/StoneTray.Direction.html @@ -2,12 +2,12 @@ - + Uses of Class jrummikub.model.StoneTray.Direction - + @@ -112,6 +112,16 @@ Uses of +private  StoneTray.DirectionStoneTray.getMoveDirection(E object, + Position position, + Pair<E,Position> blocking) + +
+          Returns the direction to move the object in
static StoneTray.Direction StoneTray.Direction.valueOf(java.lang.String name) @@ -166,6 +176,27 @@ the order they are declared.
+private  voidStoneTray.drop(E object, + Position position, + StoneTray.Direction direction) + +
+          Subroutine to "drop" to consider and determine the direction the objects + dropped one collides with position-wise evade in
+private  voidStoneTray.dropUnchecked(E object, + Position position, + StoneTray.Direction direction) + +
+          Subroutine to "drop" to execute the actual drop
protected  Pair<Position,StoneTray.Direction> StoneTray.fixInvalidDrop(E object, Position pos, @@ -182,6 +213,18 @@ the order they are declared.
+private  PositionStoneTray.getNewPosition(E object, + Position position, + StoneTray.Direction newDirection, + E currentObject, + Position currentPosition) +
           
@@ -71,6 +81,8 @@ Classes  Enums 
+PlayerSettings.Type +
StoneColor
StoneSet.Type diff --git a/doc/jrummikub/model/package-summary.html b/doc/jrummikub/model/package-summary.html index c5e4189..35ee656 100644 --- a/doc/jrummikub/model/package-summary.html +++ b/doc/jrummikub/model/package-summary.html @@ -2,12 +2,12 @@ - + jrummikub.model - + @@ -55,8 +55,8 @@ function windowTitle() PREV PACKAGE  - NEXT PACKAGEPREV PACKAGE  + NEXT PACKAGE
FRAMES    NO FRAMES   @@ -89,10 +89,6 @@ Package jrummikub.model Interface Summary -IGameState -Interface for GameState model - - IHand Interface for the Hand model @@ -101,6 +97,10 @@ Package jrummikub.model Interface for Player model +IRoundState +Interface for RoundState model + + IStoneTray<E extends Sizeable> Interface for the StoneTray model @@ -123,8 +123,12 @@ Package jrummikub.model Class Summary +GameSettings +The overall game settings + + GameState -Class managing the overall and momentary GameState +Class that stores information for a game of multiple rounds Hand @@ -135,11 +139,23 @@ Package jrummikub.model Class managing player data. +PlayerSettings +The settings of a player + + Position Stone Position class to determine positions on Table or Hand +RoundState +Class managing the overall and momentary RoundState + + +Score +Score of a single round + + Stone Basic Rummikub Stone @@ -161,6 +177,10 @@ Package jrummikub.model Table Class administering the Stones on the game-Table + +Table.StoneInfo +  +   @@ -172,6 +192,10 @@ Package jrummikub.model Enum Summary +PlayerSettings.Type +Type of turn control. + + StoneColor Class specifying possible StoneColors @@ -219,8 +243,8 @@ Package jrummikub.model PREV PACKAGE  - NEXT PACKAGEPREV PACKAGE  + NEXT PACKAGE FRAMES    NO FRAMES   diff --git a/doc/jrummikub/model/package-tree.html b/doc/jrummikub/model/package-tree.html index 7401a62..3c88d80 100644 --- a/doc/jrummikub/model/package-tree.html +++ b/doc/jrummikub/model/package-tree.html @@ -2,12 +2,12 @@ - + jrummikub.model Class Hierarchy - + @@ -55,8 +55,8 @@ function windowTitle() PREV  - NEXTPREV  + NEXT FRAMES    NO FRAMES   @@ -92,28 +92,39 @@ Class Hierarchy

Interface Hierarchy


@@ -158,8 +169,8 @@ Enum Hierarchy PREV  - NEXTPREV  + NEXT
FRAMES    NO FRAMES   diff --git a/doc/jrummikub/model/package-use.html b/doc/jrummikub/model/package-use.html index 162cfa6..79d4f71 100644 --- a/doc/jrummikub/model/package-use.html +++ b/doc/jrummikub/model/package-use.html @@ -2,12 +2,12 @@ - + Uses of Package jrummikub.model - + @@ -90,14 +90,30 @@ function windowTitle() Packages that use jrummikub.model +jrummikub.ai +   + + jrummikub.control    +jrummikub.control.network +   + + +jrummikub.control.turn +   + + jrummikub.model    +jrummikub.util +   + + jrummikub.view    @@ -108,6 +124,39 @@ Packages that use jrummikub  

+ + + + + + + + + + + + + + + + + +
+Classes in jrummikub.model used by jrummikub.ai
GameSettings + +
+          The overall game settings
Stone + +
+          Basic Rummikub Stone
StoneColor + +
+          Class specifying possible StoneColors
StoneSet + +
+          Class managing Stones joined together to form sets
+  +

@@ -115,16 +164,22 @@ Packages that use jrummikub Classes in jrummikub.model used by jrummikub.control - +          The overall game settings - +          Class that stores information for a game of multiple rounds + + + - + + + + + + + + + + +
IGameState +GameSettings
-          Interface for GameState model
IHand +GameState
-          Interface for the Hand model
IRoundState + +
+          Interface for RoundState model
ITable @@ -133,18 +188,120 @@ Classes in jrummikub.model<           Interface for the Table model
Position +PlayerSettings + +
+          The settings of a player
PlayerSettings.Type + +
+          Type of turn control.
Score + +
+          Score of a single round
StoneSet + +
+          Class managing Stones joined together to form sets
+  +

+ + + + + + + + + + + + + + + + + +
+Classes in jrummikub.model used by jrummikub.control.network
GameSettings + +
+          The overall game settings
IRoundState + +
+          Interface for RoundState model
ITable + +
+          Interface for the Table model
PlayerSettings.Type + +
+          Type of turn control.
+  +

+ + + + + + + + + + + + + + + + + + + + + + - + + +
+Classes in jrummikub.model used by jrummikub.control.turn
GameSettings + +
+          The overall game settings
IHand + +
+          Interface for the Hand model
IRoundState + +
+          Interface for RoundState model
ITable + +
+          Interface for the Table model
PlayerSettings.Type + +
+          Type of turn control.
Position
          Stone Position class to determine positions on Table or Hand
Stone +Stone
          Basic Rummikub Stone
StoneSet + +
+          Class managing Stones joined together to form sets
 

@@ -155,10 +312,16 @@ Classes in jrummikub.model< Classes in jrummikub.model used by jrummikub.model -IGameState +GameSettings
-          Interface for GameState model +          The overall game settings + + +GameState + +
+          Class that stores information for a game of multiple rounds IHand @@ -173,6 +336,12 @@ Classes in jrummikub.model<           Interface for Player model +IRoundState + +
+          Interface for RoundState model + + IStoneTray
@@ -185,6 +354,24 @@ Classes in jrummikub.model<           Interface for the Table model +Player + +
+          Class managing player data. + + +PlayerSettings + +
+          The settings of a player + + +PlayerSettings.Type + +
+          Type of turn control. + + Position
@@ -192,6 +379,12 @@ Classes in jrummikub.model< Hand +Score + +
+          Score of a single round + + Sizeable
@@ -241,6 +434,27 @@ Classes in jrummikub.model<
          Possible move directions in case of overlapping Stones/Sets + +
Table.StoneInfo + +
+            + + +  +

+ + + + + + + +
+Classes in jrummikub.model used by jrummikub.util
GameSettings + +
+          The overall game settings
 

@@ -251,6 +465,30 @@ Classes in jrummikub.model< Classes in jrummikub.model used by jrummikub.view +GameSettings + +
+          The overall game settings + + +IPlayer + +
+          Interface for Player model + + +PlayerSettings + +
+          The settings of a player + + +PlayerSettings.Type + +
+          Type of turn control. + + Position
@@ -258,12 +496,24 @@ Classes in jrummikub.model< Hand +Score + +
+          Score of a single round + + Stone
          Basic Rummikub Stone +StoneColor + +
+          Class specifying possible StoneColors + + StoneSet
@@ -279,6 +529,30 @@ Classes in jrummikub.model< Classes in jrummikub.model used by jrummikub.view.impl +GameSettings + +
+          The overall game settings + + +IPlayer + +
+          Interface for Player model + + +PlayerSettings + +
+          The settings of a player + + +PlayerSettings.Type + +
+          Type of turn control. + + Position
@@ -286,12 +560,24 @@ Classes in jrummikub.model< Hand +Score + +
+          Score of a single round + + Stone
          Basic Rummikub Stone +StoneColor + +
+          Class specifying possible StoneColors + + StoneSet
-- cgit v1.2.3