From adea871c33b19e510cf4a08899de8aad26c5101f Mon Sep 17 00:00:00 2001
From: Martin <ms618@hdm-stuttgart.de>
Date: Mon, 18 Dec 2023 21:54:59 +0100
Subject: [PATCH] Update: Minor Fixes
---
.../Persistance/Classes/MapData.java | 4 ++--
.../Persistance/Classes/Persistence.java | 2 +-
.../Persistance/Classes/RuntimeInfo.java | 24 ++++++++++++-------
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java
index d395c69f..ccd39d5d 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java
@@ -8,8 +8,8 @@ public class MapData {
private String mapID;
private String mapName;
- private int mapWidth;
- private int mapHeight;
+ private int mapWidth; //included for future use (to allow maps of different size)
+ private int mapHeight; //included for future use (to allow maps of different size)
private String mapData;
protected MapData(String mapID, String mapName, int mapWidth, int mapHeight, String mapData) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java
index f2a4fe12..527d13cc 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java
@@ -21,9 +21,9 @@ public class Persistence {
private String sizeString; //??
protected static PlayerStatistics statistics = new PlayerStatistics("", 0,0,0,0,0,0);
//suggestion: rename to "playerData"
+ protected OracleDB db = new OracleDB(); //for testing purposes; evtl. Methoden von OracleDB static machen und von GSON Handler
- OracleDB db = new OracleDB(); //for testing purposes; evtl. Methoden von OracleDB static machen und von GSON Handler
private Persistence (){}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java
index 4a696230..f20d3f53 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java
@@ -14,29 +14,37 @@ public class RuntimeInfo {
private LinkedHashMap<String, String> mapNames;
public MapData mapCreated; //to store parsed Data from MapCreator for Upload to SQL
public String communityMapSelected;
- protected ArrayList<String> coreMapsListLocal; //include mapID
- protected ArrayList<String> communityMapsListLocal; //include mapID
+ protected ArrayList<String> coreMapsListLocal;
+ protected ArrayList<String> communityMapsListLocal;
protected ArrayList<String> communityMapsListRemote;
+ protected String mapDataGame;
+
+
- public String mapTileString; //Maxe chose this name
private RuntimeInfo(){};
public static RuntimeInfo getInstance(){
return runtimeInfoSingleton;
}
- private void setMap(String mapSelected, boolean choseCoremaps){
+ public String getMapDataGame() {
+ return mapDataGame;
+ }
+
+ private void setGameMap(String mapSelected, boolean choseCoremaps){
+ mapSelected = mapSelected.substring(mapSelected.indexOf("(") + 1, mapSelected.length() - 1);
+
if(choseCoremaps) {
for (int mapListIndex = 0; mapListIndex < persistenceInst.coreMaps.size(); mapListIndex++) {
if (persistenceInst.coreMaps.get(mapListIndex).getMapID().equals("mapSelected")) {
- mapTileString = persistenceInst.coreMaps.get(mapListIndex).getMapID();
+ mapDataGame = persistenceInst.coreMaps.get(mapListIndex).getMapID();
}
}
}
else {
for (int mapListIndex = 0; mapListIndex < persistenceInst.communityMaps.size(); mapListIndex++) {
if (persistenceInst.communityMaps.get(mapListIndex).getMapID().equals("mapSelected")) {
- mapTileString = persistenceInst.coreMaps.get(mapListIndex).getMapID();
+ mapDataGame = persistenceInst.coreMaps.get(mapListIndex).getMapID();
}
}
}
@@ -58,14 +66,14 @@ public class RuntimeInfo {
public void createCoreMapsList(){
for(int i = 0; i < persistenceInst.coreMaps.size(); i++){
- coreMapsListLocal.add(persistenceInst.coreMaps.get(i).getMapName());
+ coreMapsListLocal.add(persistenceInst.coreMaps.get(i).getMapName() + " (" + persistenceInst.coreMaps.get(i).getMapID() + ")");
}
}
public void createCommunityMapsListLocal(){
try {
for (int i = 0; i < persistenceInst.communityMaps.size(); i++) {
- communityMapsListLocal.add(persistenceInst.communityMaps.get(i).getMapName());
+ communityMapsListLocal.add(persistenceInst.communityMaps.get(i).getMapName() + " (" + persistenceInst.communityMaps.get(i).getMapID() + ")");
}
}
catch (Exception e){
--
GitLab