summaryrefslogtreecommitdiffstats
path: root/src/jrummikub
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub')
-rw-r--r--src/jrummikub/control/GameControl.java4
-rw-r--r--src/jrummikub/control/RoundControl.java6
-rw-r--r--src/jrummikub/model/IRoundState.java (renamed from src/jrummikub/model/IGameState.java)4
-rw-r--r--src/jrummikub/model/RoundState.java (renamed from src/jrummikub/model/GameState.java)4
4 files changed, 9 insertions, 9 deletions
diff --git a/src/jrummikub/control/GameControl.java b/src/jrummikub/control/GameControl.java
index ae50b3c..14e5adc 100644
--- a/src/jrummikub/control/GameControl.java
+++ b/src/jrummikub/control/GameControl.java
@@ -1,6 +1,6 @@
package jrummikub.control;
-import jrummikub.model.GameState;
+import jrummikub.model.RoundState;
import jrummikub.util.IListener;
import jrummikub.view.IView;
@@ -46,7 +46,7 @@ public class GameControl {
return;
}
- GameState gameState = new GameState();
+ RoundState gameState = new RoundState();
roundControl = new RoundControl(gameState, view);
roundControl.getEndRoundEvent().add(new IListener() {
diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java
index c46d402..07adb99 100644
--- a/src/jrummikub/control/RoundControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -6,7 +6,7 @@ import java.util.List;
import java.util.Set;
import jrummikub.model.Hand;
-import jrummikub.model.IGameState;
+import jrummikub.model.IRoundState;
import jrummikub.model.IHand;
import jrummikub.model.ITable;
import jrummikub.model.Position;
@@ -23,7 +23,7 @@ import jrummikub.view.IView;
* Controller that manages a single round of rummikub
*/
public class RoundControl {
- private IGameState gameState;
+ private IRoundState gameState;
private IView view;
private ITable clonedTable;
private Event endRoundEvent = new Event();
@@ -37,7 +37,7 @@ public class RoundControl {
* @param view
* view used for user interaction
*/
- public RoundControl(IGameState gameState, IView view) {
+ public RoundControl(IRoundState gameState, IView view) {
this.gameState = gameState;
this.view = view;
}
diff --git a/src/jrummikub/model/IGameState.java b/src/jrummikub/model/IRoundState.java
index ebc31c5..cb6cd73 100644
--- a/src/jrummikub/model/IGameState.java
+++ b/src/jrummikub/model/IRoundState.java
@@ -1,9 +1,9 @@
package jrummikub.model;
/**
- * Interface for {@link GameState} model
+ * Interface for {@link RoundState} model
*/
-public interface IGameState {
+public interface IRoundState {
/**
* Get the current {@link Table}
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/RoundState.java
index 5861a32..82d93b0 100644
--- a/src/jrummikub/model/GameState.java
+++ b/src/jrummikub/model/RoundState.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
/** Class managing the overall and momentary GameState */
-public class GameState implements IGameState {
+public class RoundState implements IRoundState {
private ITable table;
private List<Player> players;
private int activePlayer;
@@ -14,7 +14,7 @@ public class GameState implements IGameState {
/**
* Create a new GameState with an empty table and (currently) 4 new players.
*/
- public GameState() {
+ public RoundState() {
table = new Table();
players = new ArrayList<Player>();
players.add(new Player("Ida", Color.RED));