summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/model/GameSettings.java
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-13 16:29:09 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-13 16:29:09 +0200
commitce7d43e3654f7f33357c51e578378a7b996bd587 (patch)
treefbfa3c1941e257b3f80ad82df446170d662b9403 /src/jrummikub/model/GameSettings.java
parent6ac71b62e309ec04feb7ebda41dd795df678e1e4 (diff)
downloadJRummikub-ce7d43e3654f7f33357c51e578378a7b996bd587.tar
JRummikub-ce7d43e3654f7f33357c51e578378a7b996bd587.zip
Viele viele Kommentare, einige zu lange oder zu komplexe Methoden gefixt
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@417 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/model/GameSettings.java')
-rw-r--r--src/jrummikub/model/GameSettings.java26
1 files changed, 20 insertions, 6 deletions
diff --git a/src/jrummikub/model/GameSettings.java b/src/jrummikub/model/GameSettings.java
index f52f8cf..2a2b45d 100644
--- a/src/jrummikub/model/GameSettings.java
+++ b/src/jrummikub/model/GameSettings.java
@@ -23,7 +23,7 @@ public class GameSettings implements Serializable {
private int highestValue;
private int stoneSetNumber;
private int numberOfStonesDealt;
- private int time;
+ private int totalTime;
private boolean noLimits;
private HashSet<StoneColor> stoneColors;
@@ -34,6 +34,9 @@ public class GameSettings implements Serializable {
reset();
}
+ /**
+ * Reset the game settings to the default values
+ */
public void reset() {
initialMeldThreshold = 30;
jokerPoints = 50;
@@ -41,7 +44,7 @@ public class GameSettings implements Serializable {
highestValue = 13;
stoneSetNumber = 2;
numberOfStonesDealt = 14;
- time = 60;
+ totalTime = 60;
noLimits = false;
stoneColors = new HashSet<StoneColor>(Arrays.asList(BLACK, BLUE,
ORANGE, RED));
@@ -151,12 +154,23 @@ public class GameSettings implements Serializable {
this.stoneSetNumber = stoneSets;
}
- public int getTime() {
- return time;
+ /**
+ * Getter for the time for a turn
+ *
+ * @return time for a turn
+ */
+ public int getTotalTime() {
+ return totalTime;
}
- public void setTime(int time) {
- this.time = time;
+ /**
+ * Setter for the time for a turn
+ *
+ * @param totalTime
+ * for a turn
+ */
+ public void setTotalTime(int totalTime) {
+ this.totalTime = totalTime;
}
/**