From f504af1180a3fdaa8fdc6f89e5b75fc852827556 Mon Sep 17 00:00:00 2001
From: Martin <ms618@hdm-stuttgart.de>
Date: Tue, 27 Feb 2024 18:07:58 +0100
Subject: [PATCH] Minor Fixes Update: Persistence.java (changed order of
parameters in signature of method) Update: RuntimeInfo.java (renamed some
methods) Update ThreadUpdateStats.java (changed order of method parameters of
called method according to changes in Persistence.java)
---
.../Model/DataStorage/Classes/Persistence.java | 4 ++--
.../Model/DataStorage/Classes/RuntimeInfo.java | 10 +++++-----
.../Model/DataStorage/Classes/ThreadUpdateStats.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java
index 852381ac..6806b230 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java
@@ -217,14 +217,14 @@ public class Persistence {
}
}
- public synchronized void updatePlayerStatistics(int kills, int deaths, int gameTime, int blocksDestroyed, int powerUpsCollected, boolean gameWon) throws DatabaseException { //after game round; only update stats in RAM, not in persistence (run savePlayerStatistics() method at end of program to save stats to persistence)
+ public synchronized void updatePlayerStatistics(boolean gameWon, int kills, int deaths, int blocksDestroyed, int powerUpsCollected, int gameTime) throws DatabaseException { //after game round; only update stats in RAM, not in persistence (run savePlayerStatistics() method at end of program to save stats to persistence)
try {
Parser.playerStatsValid(new PlayerStatistics(0, 0, kills, deaths, blocksDestroyed, powerUpsCollected, gameTime)); //temp instance of PLayerStatistics to validate new values
statistics.addKills(kills);
statistics.addDeaths(deaths);
- statistics.addGameTime(gameTime);
statistics.addBlocksDestroyed(blocksDestroyed);
statistics.addPowerUpsCollected(powerUpsCollected);
+ statistics.addGameTime(gameTime);
if (gameWon) {
statistics.addGamesWon();
} else {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
index e6fd178d..667be0e8 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
@@ -152,7 +152,7 @@ public class RuntimeInfo {
this.kills = kills;
}
- public void addKill() {
+ public void addOneKill() {
kills = kills + 1;
}
@@ -164,7 +164,7 @@ public class RuntimeInfo {
this.deaths = deaths;
}
- public void addDeath() {
+ public void addOneDeath() {
deaths = deaths + 1;
}
@@ -176,7 +176,7 @@ public class RuntimeInfo {
this.blocksDestroyed = blocksDestroyed;
}
- public void addBlockDestroyed() {
+ public void addOneBlockDestroyed() {
blocksDestroyed = blocksDestroyed + 1;
}
@@ -188,7 +188,7 @@ public class RuntimeInfo {
this.powerUpsCollected = powerUpsCollected;
}
- public void addPowerUpsCollected() {
+ public void addOnePowerUpCollected() {
powerUpsCollected = powerUpsCollected + 1;
}
@@ -200,7 +200,7 @@ public class RuntimeInfo {
this.gameTime = gameTime;
}
- public void addGameTime() {
+ public void incrementGameTime() {
gameTime = gameTime + 1;
}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java
index c5b27d96..c34a7214 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/ThreadUpdateStats.java
@@ -17,7 +17,7 @@ public class ThreadUpdateStats extends Thread{
try {
threadsInstance.setThreadUpdateStatsMsg("");
threadsInstance.setThreadUpdateStats(ThreadStatus.RUNNING);
- persistenceInst.updatePlayerStatistics(runtimeInfoInst.getKills(), runtimeInfoInst.getDeaths(), runtimeInfoInst.getGameTime(), runtimeInfoInst.getBlocksDestroyed(), runtimeInfoInst.getPowerUpsCollected(), runtimeInfoInst.isGameWon());
+ persistenceInst.updatePlayerStatistics(runtimeInfoInst.isGameWon(), runtimeInfoInst.getKills(), runtimeInfoInst.getDeaths(), runtimeInfoInst.getBlocksDestroyed(), runtimeInfoInst.getPowerUpsCollected(), runtimeInfoInst.getGameTime());
runtimeInfoInst.resetGameStats();
log.info("Update statistics thread finished successfully!");
threadsInstance.setThreadUpdateStats(ThreadStatus.FINISHED);
--
GitLab