From 42a03eb40717e3825aa6d9e805e957ad24d83fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20G=C3=BCtzkow?= <cjgutzkow@gmail.com>
Date: Fri, 20 May 2022 20:04:53 +0200
Subject: [PATCH 1/2] refactor: removed coupling between controllers and added
singleton class to hold information
---
javadoc/allclasses-index.html | 62 +--
javadoc/allpackages-index.html | 4 +-
javadoc/constant-values.html | 4 +-
javadoc/deprecated-list.html | 4 +-
.../ntnu/idatt2001/carljgu/battle/Army.html | 4 +-
.../ntnu/idatt2001/carljgu/battle/Battle.html | 4 +-
.../carljgu/battle/SimulationAttack.html | 4 +-
.../idatt2001/carljgu/battle/Terrain.html | 4 +-
.../carljgu/battle/package-summary.html | 4 +-
.../carljgu/battle/package-tree.html | 4 +-
.../idatt2001/carljgu/battle/units/Unit.html | 4 +-
.../carljgu/battle/units/UnitFactory.html | 4 +-
.../carljgu/battle/units/UnitType.html | 4 +-
.../carljgu/battle/units/package-summary.html | 4 +-
.../carljgu/battle/units/package-tree.html | 4 +-
.../battle/units/specialized/CavalryUnit.html | 4 +-
.../units/specialized/CommanderUnit.html | 4 +-
.../units/specialized/InfantryUnit.html | 4 +-
.../battle/units/specialized/RangedUnit.html | 4 +-
.../units/specialized/package-summary.html | 4 +-
.../units/specialized/package-tree.html | 4 +-
.../ntnu/idatt2001/carljgu/client/App.html | 4 +-
.../client/BattleSimulationSingleton.html | 467 ++++++++++++++++++
.../ntnu/idatt2001/carljgu/client/Main.html | 4 +-
.../client/controllers/BattleController.html | 38 +-
.../controllers/EditArmyController.html | 42 +-
.../client/controllers/package-summary.html | 4 +-
.../client/controllers/package-tree.html | 4 +-
.../carljgu/client/dialogs/DialogBox.html | 4 +-
.../client/dialogs/DialogBoxBuilder.html | 4 +-
.../client/dialogs/package-summary.html | 4 +-
.../carljgu/client/dialogs/package-tree.html | 4 +-
.../carljgu/client/package-summary.html | 10 +-
.../carljgu/client/package-tree.html | 5 +-
.../carljgu/filehandling/ArmyFileHandler.html | 4 +-
.../filehandling/FileExtensionException.html | 4 +-
.../carljgu/filehandling/package-summary.html | 4 +-
.../carljgu/filehandling/package-tree.html | 4 +-
.../module-summary.html | 4 +-
javadoc/help-doc.html | 4 +-
javadoc/index-files/index-1.html | 8 +-
javadoc/index-files/index-10.html | 4 +-
javadoc/index-files/index-11.html | 4 +-
javadoc/index-files/index-12.html | 8 +-
javadoc/index-files/index-13.html | 33 +-
javadoc/index-files/index-14.html | 4 +-
javadoc/index-files/index-15.html | 4 +-
javadoc/index-files/index-16.html | 4 +-
javadoc/index-files/index-17.html | 4 +-
javadoc/index-files/index-2.html | 8 +-
javadoc/index-files/index-3.html | 4 +-
javadoc/index-files/index-4.html | 6 +-
javadoc/index-files/index-5.html | 4 +-
javadoc/index-files/index-6.html | 4 +-
javadoc/index-files/index-7.html | 44 +-
javadoc/index-files/index-8.html | 4 +-
javadoc/index-files/index-9.html | 8 +-
javadoc/index.html | 4 +-
javadoc/member-search-index.js | 2 +-
javadoc/overview-tree.html | 5 +-
javadoc/serialized-form.html | 4 +-
javadoc/type-search-index.js | 2 +-
.../ntnu/idatt2001/carljgu/battle/Army.java | 2 +-
.../client/BattleSimulationSingleton.java | 230 +++++++++
.../client/controllers/BattleController.java | 119 ++---
.../controllers/EditArmyController.java | 67 ++-
66 files changed, 1036 insertions(+), 314 deletions(-)
create mode 100644 javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
create mode 100644 src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.java
diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html
index c75e686..47c401e 100644
--- a/javadoc/allclasses-index.html
+++ b/javadoc/allclasses-index.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>All Classes and Interfaces</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="class index">
<meta name="generator" content="javadoc/AllClassesIndexWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
@@ -84,66 +84,70 @@ loadScripts(document, 'script');</script>
<div class="block">A controller class which
handles events in the fxml file battle-armies.fxml.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Class CavalryUnit that inherits from Unit.</div>
+<div class="block">Singleton class to hold information for the controllers.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Class CommanderUnit that inherits from CavalryUnit.</div>
+<div class="block">Class CavalryUnit that inherits from Unit.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBox</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="block">Class CommanderUnit that inherits from CavalryUnit.</div>
+</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBox</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">A dialog box that extends alert to use
a builder to build a dialog box.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">A builder class which simplifies the process of
building a DialogBox object.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">A controller class which
handles events in the fxml file edit-army.fxml.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab5">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab5"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab5">
<div class="block">Thrown if an extension of a file is invalid
The exception thrown needs to have a message</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class InfantryUnit that inherits from Unit.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">The main class that is run when the application
is called upon.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class RangedUnit that inherits from Unit.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">Deprecated.
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">Deprecated.
<div class="deprecation-comment">Provided no extra functionality and made the program harder to read.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab3"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab3">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab3">
<div class="block">An enum that represents the different terrains
that the battles can occur on.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">The abstract class Unit.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">A class to simply and elegantly create units.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab3">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab3"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab3">
<div class="block">An enum that represents the different unit types
that an army can contain.</div>
</div>
diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html
index 0f7e213..bc9aaa7 100644
--- a/javadoc/allpackages-index.html
+++ b/javadoc/allpackages-index.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>All Packages</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="package index">
<meta name="generator" content="javadoc/AllPackagesIndexWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index eb9c4ba..fc7f849 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Constant Field Values</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="summary of constants">
<meta name="generator" content="javadoc/ConstantsSummaryWriterImpl">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index b88ee67..3e3a27f 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Deprecated List</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="deprecated elements">
<meta name="generator" content="javadoc/DeprecatedListWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
index 456aaa3..963d07a 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Army</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, class: Army">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
index 79297cc..d638275 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Battle</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, class: Battle">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
index 77d4534..316ef97 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>SimulationAttack</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, class: SimulationAttack">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
index 11049af..8b91455 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Terrain</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, enum: Terrain">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
index 0f41adb..2d60586 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
index 58367c6..2bb4c96 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
index 854b95d..ea47c75 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Unit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units, class: Unit">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
index d40e686..82f2a0a 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>UnitFactory</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units, class: UnitFactory">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
index b87aeb5..538557c 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>UnitType</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units, enum: UnitType">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
index 540446a..de722ed 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
index 0d9f80c..a9fcdd7 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
index d8c6839..51ea22e 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>CavalryUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: CavalryUnit">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
index 1c6c108..306c348 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>CommanderUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: CommanderUnit">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
index e5a0f61..6b11c04 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>InfantryUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: InfantryUnit">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
index c216972..ba1eff0 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>RangedUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: RangedUnit">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
index d27d811..1ff52f5 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units.specialized</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
index 6aac075..1435b49 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units.specialized Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
index 8e5ed9b..1b39221 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>App</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client, class: App">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
new file mode 100644
index 0000000..18007e3
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
@@ -0,0 +1,467 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<title>BattleSimulationSingleton</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-20">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client, class: BattleSimulationSingleton">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<h1 title="Class BattleSimulationSingleton" class="title">Class BattleSimulationSingleton</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.BattleSimulationSingleton</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">BattleSimulationSingleton</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
+<div class="block">Singleton class to hold information for the controllers.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.1 20.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#atLestOneOriginalArmyIsNull()" class="member-name-link">atLestOneOriginalArmyIsNull</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Checks if more than one army is null</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getArmiesAmount()" class="member-name-link">getArmiesAmount</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the amount of armies.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBattle()" class="member-name-link">getBattle</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the current battle.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#getBattleSimulation()" class="member-name-link">getBattleSimulation</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Gets the battle simulation instance</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCurrentArmyByCurrentNumber()" class="member-name-link">getCurrentArmyByCurrentNumber</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets current army by current number.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCurrentArmyByNumber(int)" class="member-name-link">getCurrentArmyByNumber</a><wbr>(int armyNumber)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets current army by an army index number.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCurrentArmyNumber()" class="member-name-link">getCurrentArmyNumber</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the current army number.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getFilePathByNumber(int)" class="member-name-link">getFilePathByNumber</a><wbr>(int armyNumber)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets file path by an army index number.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getImportedLinesSkipped()" class="member-name-link">getImportedLinesSkipped</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets a list of all lines skipped when importing an army.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getOriginalArmyByNumber(int)" class="member-name-link">getOriginalArmyByNumber</a><wbr>(int armyNumber)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the original army by an army index number.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getScoreByNumber(int)" class="member-name-link">getScoreByNumber</a><wbr>(int armyNumber)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets score by an army index number.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#incrementScore(int)" class="member-name-link">incrementScore</a><wbr>(int armyNumber)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Increment score at an army index number.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#resetScores()" class="member-name-link">resetScores</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Fills the array with scores with zeroes</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)" class="member-name-link">setBattle</a><wbr>(<a href="../battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a> battle)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets the current battle.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setCurrentArmyByNumber</a><wbr>(int armyNumber,
+ <a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets current army at an army index number.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setCurrentArmyNumber(int)" class="member-name-link">setCurrentArmyNumber</a><wbr>(int armyNumber)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets current army index number.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setFilePathByNumber(int,java.lang.String)" class="member-name-link">setFilePathByNumber</a><wbr>(int armyNumber,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> filePath)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets file path at an army index number.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setImportedLinesSkipped(java.util.List)" class="member-name-link">setImportedLinesSkipped</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>> importedLinesSkipped)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets which lines were skipped during import.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmyByNumber</a><wbr>(int armyNumber,
+ <a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets original army at an army index number.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setScoreByNumber(int,int)" class="member-name-link">setScoreByNumber</a><wbr>(int armyNumber,
+ int score)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets score at an army index number.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getBattleSimulation()">
+<h3>getBattleSimulation</h3>
+<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type"><a href="BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></span> <span class="element-name">getBattleSimulation</span>()</div>
+<div class="block">Gets the battle simulation instance</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>battleSimulationSingleton - BattleSimulationSingleton - the simulation object that holds the models' information</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getBattle()">
+<h3>getBattle</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></span> <span class="element-name">getBattle</span>()</div>
+<div class="block">Gets the current battle.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>battle - Battle - the current battle to simulate.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)">
+<h3>setBattle</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setBattle</span><wbr><span class="parameters">(<a href="../battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a> battle)</span></div>
+<div class="block">Sets the current battle.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>battle</code> - Battle - the current battle to simulate.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getOriginalArmyByNumber(int)">
+<h3>getOriginalArmyByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">getOriginalArmyByNumber</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Gets the original army by an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dt>Returns:</dt>
+<dd>Army - an army in the original army array.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)">
+<h3>setOriginalArmyByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setOriginalArmyByNumber</span><wbr><span class="parameters">(int armyNumber,
+ <a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</span></div>
+<div class="block">Sets original army at an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dd><code>army</code> - Army - an army in the original army array.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="atLestOneOriginalArmyIsNull()">
+<h3>atLestOneOriginalArmyIsNull</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">boolean</span> <span class="element-name">atLestOneOriginalArmyIsNull</span>()</div>
+<div class="block">Checks if more than one army is null</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>boolean - true if at least one army is a null object.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getCurrentArmyByNumber(int)">
+<h3>getCurrentArmyByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">getCurrentArmyByNumber</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Gets current army by an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dt>Returns:</dt>
+<dd>Army - an army in the current army array.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)">
+<h3>setCurrentArmyByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setCurrentArmyByNumber</span><wbr><span class="parameters">(int armyNumber,
+ <a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</span></div>
+<div class="block">Sets current army at an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dd><code>army</code> - Army - an army in the current army array.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getScoreByNumber(int)">
+<h3>getScoreByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getScoreByNumber</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Gets score by an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dt>Returns:</dt>
+<dd>int - how many simulations an army has won.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setScoreByNumber(int,int)">
+<h3>setScoreByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setScoreByNumber</span><wbr><span class="parameters">(int armyNumber,
+ int score)</span></div>
+<div class="block">Sets score at an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dd><code>score</code> - int - how many simulations an army has won.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="incrementScore(int)">
+<h3>incrementScore</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">incrementScore</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Increment score at an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="resetScores()">
+<h3>resetScores</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">resetScores</span>()</div>
+<div class="block">Fills the array with scores with zeroes</div>
+</section>
+</li>
+<li>
+<section class="detail" id="getFilePathByNumber(int)">
+<h3>getFilePathByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">getFilePathByNumber</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Gets file path by an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dt>Returns:</dt>
+<dd>String - file path for an army at the army index number.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setFilePathByNumber(int,java.lang.String)">
+<h3>setFilePathByNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setFilePathByNumber</span><wbr><span class="parameters">(int armyNumber,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> filePath)</span></div>
+<div class="block">Sets file path at an army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the index of the army.</dd>
+<dd><code>filePath</code> - String - file path for an army at the army index number.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getImportedLinesSkipped()">
+<h3>getImportedLinesSkipped</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></span> <span class="element-name">getImportedLinesSkipped</span>()</div>
+<div class="block">Gets a list of all lines skipped when importing an army.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>importedLinesSkipped - List - which lines were skipped during importing and why.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setImportedLinesSkipped(java.util.List)">
+<h3>setImportedLinesSkipped</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setImportedLinesSkipped</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>> importedLinesSkipped)</span></div>
+<div class="block">Sets which lines were skipped during import.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>importedLinesSkipped</code> - List - which lines were skipped during importing and why.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getArmiesAmount()">
+<h3>getArmiesAmount</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getArmiesAmount</span>()</div>
+<div class="block">Gets the amount of armies.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>int - amount of armies.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getCurrentArmyNumber()">
+<h3>getCurrentArmyNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getCurrentArmyNumber</span>()</div>
+<div class="block">Gets the current army number.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>int - the current army number.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setCurrentArmyNumber(int)">
+<h3>setCurrentArmyNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setCurrentArmyNumber</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Sets current army index number.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - army index number.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getCurrentArmyByCurrentNumber()">
+<h3>getCurrentArmyByCurrentNumber</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">getCurrentArmyByCurrentNumber</span>()</div>
+<div class="block">Gets current army by current number.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>Army - the current army at the current army index number.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
index d0769ca..be68bce 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Main</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client, class: Main">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
index 2267193..24a3a62 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>BattleController</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers, class: BattleController">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
@@ -91,7 +91,7 @@ implements javafx.fxml.Initializable</span></div>
armies and simulate the battle</div>
<dl class="notes">
<dt>Version:</dt>
-<dd>1.9 14.05.2022</dd>
+<dd>2.0 14.05.2022</dd>
<dt>Author:</dt>
<dd>Carl Gützkow</dd>
</dl>
@@ -116,7 +116,7 @@ implements javafx.fxml.Initializable</span></div>
<section class="method-summary" id="method-summary">
<h2>Method Summary</h2>
<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
<div id="method-summary-table.tabpanel" role="tabpanel">
<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
<div class="table-header col-first">Modifier and Type</div>
@@ -130,8 +130,7 @@ implements javafx.fxml.Initializable</span></div>
create an army to.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">displayArmy</a><wbr>(int armyNumber,
- <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#displayArmy(int)" class="member-name-link">displayArmy</a><wbr>(int armyNumber)</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Updates the information about an army
in the chosen elements.</div>
@@ -177,13 +176,6 @@ implements javafx.fxml.Initializable</span></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Run when clicking on the button reset and run.</div>
</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmy</a><wbr>(int armyNumber,
- <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
-<div class="block">Inserts an army into the originalArmies table
- Useful for sending armies across controllers.</div>
-</div>
</div>
</div>
</div>
@@ -216,20 +208,6 @@ implements javafx.fxml.Initializable</span></div>
<h2>Method Details</h2>
<ul class="member-list">
<li>
-<section class="detail" id="setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)">
-<h3>setOriginalArmy</h3>
-<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type">void</span> <span class="element-name">setOriginalArmy</span><wbr><span class="parameters">(int armyNumber,
- <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</span></div>
-<div class="block">Inserts an army into the originalArmies table
- Useful for sending armies across controllers.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>armyNumber</code> - int - the insertion index for the army.</dd>
-<dd><code>army</code> - Army - the army to insert into the table.</dd>
-</dl>
-</section>
-</li>
-<li>
<section class="detail" id="importArmyOne()">
<h3>importArmyOne</h3>
<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">importArmyOne</span>()</div>
@@ -271,10 +249,9 @@ implements javafx.fxml.Initializable</span></div>
</section>
</li>
<li>
-<section class="detail" id="displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)">
+<section class="detail" id="displayArmy(int)">
<h3>displayArmy</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">displayArmy</span><wbr><span class="parameters">(int armyNumber,
- <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</span>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">displayArmy</span><wbr><span class="parameters">(int armyNumber)</span>
throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></span></div>
<div class="block">Updates the information about an army
in the chosen elements.
@@ -283,7 +260,6 @@ implements javafx.fxml.Initializable</span></div>
<dl class="notes">
<dt>Parameters:</dt>
<dd><code>armyNumber</code> - int - 0 or 1 depending on which elements to use to display an army.</dd>
-<dd><code>army</code> - Army - the army to display.</dd>
<dt>Throws:</dt>
<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - thrown if the army is null</dd>
</dl>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
index f671fd4..6fbbde3 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>EditArmyController</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers, class: EditArmyController">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
@@ -170,7 +170,7 @@ implements javafx.fxml.Initializable</span></div>
<section class="method-summary" id="method-summary">
<h2>Method Summary</h2>
<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
<div id="method-summary-table.tabpanel" role="tabpanel">
<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
<div class="table-header col-first">Modifier and Type</div>
@@ -213,25 +213,19 @@ implements javafx.fxml.Initializable</span></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Run when the fxml file is first loaded.</div>
</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)" class="member-name-link">setArmyToEdit</a><wbr>(<a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyToEdit,
- int armyNumberToEdit)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
-<div class="block">Sets army to edit.</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateAllFields()" class="member-name-link">updateAllFields</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Update all fields and labels with updated information.</div>
</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateAllFields()" class="member-name-link">updateAllFields</a>()</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Update all fields and labels with updated information.</div>
+<div class="block">Update army and go back.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack</a>()</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#writeToCSV()" class="member-name-link">writeToCSV</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Update army and go back.</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#writeToCSV()" class="member-name-link">writeToCSV</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Writes the changed army to a csv file.</div>
</div>
</div>
@@ -358,22 +352,6 @@ implements javafx.fxml.Initializable</span></div>
<h2>Method Details</h2>
<ul class="member-list">
<li>
-<section class="detail" id="setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)">
-<h3>setArmyToEdit</h3>
-<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type">void</span> <span class="element-name">setArmyToEdit</span><wbr><span class="parameters">(<a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyToEdit,
- int armyNumberToEdit)</span></div>
-<div class="block">Sets army to edit.
- Called from the BattleController to set
- the army to edit.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>armyToEdit</code> - the army to edit</dd>
-<dd><code>armyNumberToEdit</code> - int - the selected army to import.
- 0 for army one and 1 for army two</dd>
-</dl>
-</section>
-</li>
-<li>
<section class="detail" id="editArmyName()">
<h3>editArmyName</h3>
<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">editArmyName</span>()</div>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
index 1cd2229..e37cb9d 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.controllers</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
index f3dbbf7..f38bcc5 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.controllers Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
index c2571f5..953c682 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>DialogBox</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs, class: DialogBox">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
index c8d63fc..4f2f51b 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>DialogBoxBuilder</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs, class: DialogBoxBuilder">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
index f66a931..7c4d101 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.dialogs</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
index 434f655..64e0706 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.dialogs Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
index f013074..56088d9 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -88,8 +88,12 @@ loadScripts(document, 'script');</script>
<div class="block">Class that extends Application
from javafx.</div>
</div>
-<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></div>
<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="block">Singleton class to hold information for the controllers.</div>
+</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
<div class="block">The main class that is run when the application
is called upon.</div>
</div>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
index 7be7ac9..cb29930 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -65,6 +65,7 @@ loadScripts(document, 'script');</script>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="App.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></li>
</ul>
</li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="BattleSimulationSingleton.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="Main.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></li>
</ul>
</li>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
index 0d28cdd..4bec739 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>ArmyFileHandler</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling, class: ArmyFileHandler">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
index b89d317..ffde5e5 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>FileExtensionException</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling, class: FileExtensionException">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
index e5febfb..636d51c 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.filehandling</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
index 3a18bfd..bb6be76 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.filehandling Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
index 9c20b30..e1bec25 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client">
<meta name="generator" content="javadoc/ModuleWriterImpl">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index fe443be..7b6d1c8 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>API Help</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="help">
<meta name="generator" content="javadoc/HelpWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html
index dcda933..3baa881 100644
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>A-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: A">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -110,6 +110,10 @@ loadScripts(document, 'script');</script>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#armyUnitsListView" class="member-name-link">armyUnitsListView</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#atLestOneOriginalArmyIsNull()" class="member-name-link">atLestOneOriginalArmyIsNull()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Checks if more than one army is null</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">attack(Unit, Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Method for dealing damage to another unit.</div>
diff --git a/javadoc/index-files/index-10.html b/javadoc/index-files/index-10.html
index 7e24e99..bd90fef 100644
--- a/javadoc/index-files/index-10.html
+++ b/javadoc/index-files/index-10.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>M-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: M">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-11.html b/javadoc/index-files/index-11.html
index dca890d..9d67fa8 100644
--- a/javadoc/index-files/index-11.html
+++ b/javadoc/index-files/index-11.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>P-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: P">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-12.html b/javadoc/index-files/index-12.html
index bbfc249..35c74b1 100644
--- a/javadoc/index-files/index-12.html
+++ b/javadoc/index-files/index-12.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>R-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: R">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -84,6 +84,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Run when clicking on reset armies.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#resetScores()" class="member-name-link">resetScores()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Fills the array with scores with zeroes</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#run(java.lang.String%5B%5D)" class="member-name-link">run(String[])</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></dt>
<dd>
<div class="block">Method called from Main when the program is run
diff --git a/javadoc/index-files/index-13.html b/javadoc/index-files/index-13.html
index b31855d..160e7bb 100644
--- a/javadoc/index-files/index-13.html
+++ b/javadoc/index-files/index-13.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>S-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: S">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -54,9 +54,21 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:S">S</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)" class="member-name-link">setArmyToEdit(Army, int)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)" class="member-name-link">setBattle(Battle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">Sets army to edit.</div>
+<div class="block">Sets the current battle.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setCurrentArmyByNumber(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets current army at an army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setCurrentArmyNumber(int)" class="member-name-link">setCurrentArmyNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets current army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setFilePathByNumber(int,java.lang.String)" class="member-name-link">setFilePathByNumber(int, String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets file path at an army index number.</div>
</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setHeader(java.lang.String)" class="member-name-link">setHeader(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd>
@@ -70,6 +82,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Add image to the dialog box builder configuration.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setImportedLinesSkipped(java.util.List)" class="member-name-link">setImportedLinesSkipped(List<String>)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets which lines were skipped during import.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setListMessage(java.util.List)" class="member-name-link">setListMessage(List<String>)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd>
<div class="block">Adds a list message for the dialog box.</div>
@@ -82,10 +98,13 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Sets the army's name</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmy(int, Army)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmyByNumber(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets original army at an army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setScoreByNumber(int,int)" class="member-name-link">setScoreByNumber(int, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">Inserts an army into the originalArmies table
- Useful for sending armies across controllers.</div>
+<div class="block">Sets score at an army index number.</div>
</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setTitle(java.lang.String)" class="member-name-link">setTitle(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd>
diff --git a/javadoc/index-files/index-14.html b/javadoc/index-files/index-14.html
index 2ed2a7b..51c287a 100644
--- a/javadoc/index-files/index-14.html
+++ b/javadoc/index-files/index-14.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>T-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: T">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-15.html b/javadoc/index-files/index-15.html
index f301e55..40f3e3b 100644
--- a/javadoc/index-files/index-15.html
+++ b/javadoc/index-files/index-15.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>U-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: U">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-16.html b/javadoc/index-files/index-16.html
index 473af09..5240df5 100644
--- a/javadoc/index-files/index-16.html
+++ b/javadoc/index-files/index-16.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>V-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: V">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-17.html b/javadoc/index-files/index-17.html
index 3c5ce3f..f01df32 100644
--- a/javadoc/index-files/index-17.html
+++ b/javadoc/index-files/index-17.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>W-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: W">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html
index 22cfdc9..bf27730 100644
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>B-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: B">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -69,6 +69,10 @@ loadScripts(document, 'script');</script>
</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#%3Cinit%3E()" class="member-name-link">BattleController()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></dt>
+<dd>
+<div class="block">Singleton class to hold information for the controllers.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#build()" class="member-name-link">build()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd>
<div class="block">Create the dialog box with the
diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html
index c4a4869..e03c667 100644
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>C-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: C">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html
index f223b66..5417253 100644
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>D-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: D">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -85,7 +85,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Instantiates a new dialog box builder.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">displayArmy(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#displayArmy(int)" class="member-name-link">displayArmy(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Updates the information about an army
in the chosen elements.</div>
diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html
index 2cae257..f6d78b3 100644
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>E-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: E">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html
index a50bcc5..66da2e4 100644
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>F-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: F">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html
index 60f6dfa..1282faf 100644
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>G-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: G">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -62,6 +62,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets all units.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getArmiesAmount()" class="member-name-link">getArmiesAmount()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets the amount of armies.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getArmor()" class="member-name-link">getArmor()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets armor.</div>
@@ -103,6 +107,14 @@ loadScripts(document, 'script');</script>
to easily hold the information
about each attack.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getBattle()" class="member-name-link">getBattle()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets the current battle.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getBattleSimulation()" class="member-name-link">getBattleSimulation()</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets the battle simulation instance</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getCalculatedStrength()" class="member-name-link">getCalculatedStrength()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Calculates the strength of an army
@@ -127,6 +139,18 @@ loadScripts(document, 'script');</script>
<div class="block">Returns a list of commander units
using stream and filter.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getCurrentArmyByCurrentNumber()" class="member-name-link">getCurrentArmyByCurrentNumber()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets current army by current number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getCurrentArmyByNumber(int)" class="member-name-link">getCurrentArmyByNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets current army by an army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getCurrentArmyNumber()" class="member-name-link">getCurrentArmyNumber()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets the current army number.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#getDamageDealt()" class="member-name-link">getDamageDealt()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></dt>
<dd>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
@@ -149,6 +173,10 @@ loadScripts(document, 'script');</script>
<div class="block">Uses the system default file explorer to get
a file path of the user's choice.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getFilePathByNumber(int)" class="member-name-link">getFilePathByNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets file path by an army index number.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#getHeader()" class="member-name-link">getHeader()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd>
<div class="block">Gets the header for the dialog box.</div>
@@ -161,6 +189,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the image for the dialog box.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getImportedLinesSkipped()" class="member-name-link">getImportedLinesSkipped()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets a list of all lines skipped when importing an army.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getInfantryUnits()" class="member-name-link">getInfantryUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Returns a list of infantry units
@@ -182,6 +214,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets name.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getOriginalArmyByNumber(int)" class="member-name-link">getOriginalArmyByNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets the original army by an army index number.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getRandom()" class="member-name-link">getRandom()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Gets a random unit from the list.</div>
@@ -216,6 +252,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets resist bonus.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#getScoreByNumber(int)" class="member-name-link">getScoreByNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Gets score by an army index number.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#getStage()" class="member-name-link">getStage()</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></dt>
<dd>
<div class="block">Gets the main stage for the program</div>
diff --git a/javadoc/index-files/index-8.html b/javadoc/index-files/index-8.html
index 3bf229c..8e93dc3 100644
--- a/javadoc/index-files/index-8.html
+++ b/javadoc/index-files/index-8.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>H-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: H">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-9.html b/javadoc/index-files/index-9.html
index 8732bd7..1bbd601 100644
--- a/javadoc/index-files/index-9.html
+++ b/javadoc/index-files/index-9.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>I-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index: I">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -62,6 +62,10 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Imports an army for the second army.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#incrementScore(int)" class="member-name-link">incrementScore(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Increment score at an army index number.</div>
+</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#INFANTRY_UNIT" class="member-name-link">INFANTRY_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></dt>
diff --git a/javadoc/index.html b/javadoc/index.html
index 224599a..416b4f4 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Generated Documentation (Untitled)</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="index redirect">
<meta name="generator" content="javadoc/IndexRedirectWriter">
<link rel="canonical" href="edu.ntnu.idatt2001.carljgu.client/module-summary.html">
diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js
index 6431d5e..09c285b 100644
--- a/javadoc/member-search-index.js
+++ b/javadoc/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"displayArmy(int, Army)","u":"displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"hboxRoot"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"setArmyToEdit(Army, int)","u":"setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"setOriginalArmy(int, Army)","u":"setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)"}];updateSearchResults();
\ No newline at end of file
+memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"atLestOneOriginalArmyIsNull()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"displayArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getArmiesAmount()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattle()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattleSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByCurrentNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getFilePathByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getImportedLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getOriginalArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getScoreByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"hboxRoot"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"incrementScore(int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"resetScores()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setBattle(Battle)","u":"setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyByNumber(int, Army)","u":"setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setFilePathByNumber(int, String)","u":"setFilePathByNumber(int,java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setImportedLinesSkipped(List<String>)","u":"setImportedLinesSkipped(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setOriginalArmyByNumber(int, Army)","u":"setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setScoreByNumber(int, int)","u":"setScoreByNumber(int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index db34eb7..9b1d3a5 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="class tree">
<meta name="generator" content="javadoc/TreeWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
@@ -75,6 +75,7 @@ loadScripts(document, 'script');</script>
<li class="circle">edu.ntnu.idatt2001.carljgu.filehandling.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.controllers.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></li>
<li class="circle">javafx.scene.control.Dialog<R> (implements javafx.event.EventTarget)
<ul>
<li class="circle">javafx.scene.control.Alert
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
index c3ab246..fc9d3d5 100644
--- a/javadoc/serialized-form.html
+++ b/javadoc/serialized-form.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
<title>Serialized Form</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2022-05-19">
+<meta name="dc.created" content="2022-05-20">
<meta name="description" content="serialized forms">
<meta name="generator" content="javadoc/SerializedFormWriterImpl">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/type-search-index.js b/javadoc/type-search-index.js
index 14c6ad7..7fa0df9 100644
--- a/javadoc/type-search-index.js
+++ b/javadoc/type-search-index.js
@@ -1 +1 @@
-typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"App"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Army"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","l":"ArmyFileHandler"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Battle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","l":"BattleController"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"CavalryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"CommanderUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBoxBuilder"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","l":"EditArmyController"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","l":"FileExtensionException"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"InfantryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"Main"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"RangedUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"SimulationAttack"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Terrain"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"Unit"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"UnitFactory"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"UnitType"}];updateSearchResults();
\ No newline at end of file
+typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"App"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Army"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","l":"ArmyFileHandler"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Battle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","l":"BattleController"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"BattleSimulationSingleton"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"CavalryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"CommanderUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBoxBuilder"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","l":"EditArmyController"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","l":"FileExtensionException"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"InfantryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"Main"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"RangedUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"SimulationAttack"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Terrain"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"Unit"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"UnitFactory"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"UnitType"}];updateSearchResults();
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java
index f5ce3a0..3592126 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java
@@ -39,7 +39,7 @@ public class Army {
public Army(String name, List<Unit> units) throws IllegalArgumentException {
if (name.isBlank()) throw new IllegalArgumentException("Name can not be empty");
this.name = name;
- this.units = FXCollections.observableArrayList(units);
+ this.units = FXCollections.observableList(units);
}
/**
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.java
new file mode 100644
index 0000000..b5b99bd
--- /dev/null
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.java
@@ -0,0 +1,230 @@
+package edu.ntnu.idatt2001.carljgu.client;
+
+import edu.ntnu.idatt2001.carljgu.battle.Army;
+import edu.ntnu.idatt2001.carljgu.battle.Battle;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Singleton class to hold information for the controllers.
+ *
+ * @author Carl Gützkow
+ * @version 1.1 20.05.2022
+ */
+public class BattleSimulationSingleton {
+
+ private final static BattleSimulationSingleton battleSimulationSingleton =
+ new BattleSimulationSingleton();
+ private Battle battle;
+ private final Army[] originalArmies;
+ private final Army[] currentArmies;
+ private final int[] scores;
+ private final String[] filePaths;
+ private List<String> importedLinesSkipped;
+ private final int amountOfArmies;
+ private int currentArmyNumber;
+
+ /**
+ * Private constructor to uphold
+ * singleton design pattern.
+ * initializes the arrays.
+ */
+ private BattleSimulationSingleton() {
+ amountOfArmies = 2;
+ originalArmies = new Army[amountOfArmies];
+ currentArmies = new Army[amountOfArmies];
+ scores = new int[amountOfArmies];
+ Arrays.fill(scores, 0);
+ filePaths = new String[amountOfArmies];
+ }
+
+ /**
+ * Gets the battle simulation instance
+ *
+ * @return battleSimulationSingleton - BattleSimulationSingleton - the simulation object that holds the models' information
+ */
+ public static BattleSimulationSingleton getBattleSimulation() {
+ return battleSimulationSingleton;
+ }
+
+
+ /**
+ * Gets the current battle.
+ *
+ * @return battle - Battle - the current battle to simulate.
+ */
+ public Battle getBattle() {
+ return battle;
+ }
+
+ /**
+ * Sets the current battle.
+ *
+ * @param battle Battle - the current battle to simulate.
+ */
+ public void setBattle(Battle battle) {
+ this.battle = battle;
+ }
+
+ /**
+ * Gets the original army by an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @return Army - an army in the original army array.
+ */
+ public Army getOriginalArmyByNumber(int armyNumber) {
+ return originalArmies[armyNumber];
+ }
+
+ /**
+ * Sets original army at an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @param army Army - an army in the original army array.
+ */
+ public void setOriginalArmyByNumber(int armyNumber, Army army) {
+ originalArmies[armyNumber] = army;
+ currentArmies[armyNumber] = army;
+ }
+
+ /**
+ * Checks if more than one army is null
+ *
+ * @return boolean - true if at least one army is a null object.
+ */
+ public boolean atLestOneOriginalArmyIsNull() {
+ return Arrays.stream(originalArmies).anyMatch(Objects::isNull);
+ }
+
+ /**
+ * Gets current army by an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @return Army - an army in the current army array.
+ */
+ public Army getCurrentArmyByNumber(int armyNumber) {
+ return currentArmies[armyNumber];
+ }
+
+ /**
+ * Sets current army at an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @param army Army - an army in the current army array.
+ */
+ public void setCurrentArmyByNumber(int armyNumber, Army army) {
+ currentArmies[armyNumber] = army;
+ }
+
+ /**
+ * Gets score by an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @return int - how many simulations an army has won.
+ */
+ public int getScoreByNumber(int armyNumber) {
+ return scores[armyNumber];
+ }
+
+ /**
+ * Sets score at an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @param score int - how many simulations an army has won.
+ */
+ public void setScoreByNumber(int armyNumber, int score) {
+ scores[armyNumber] = score;
+ }
+
+ /**
+ * Increment score at an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ */
+ public void incrementScore(int armyNumber) {
+ scores[armyNumber]++;
+ }
+
+ /**
+ * Fills the array with scores with zeroes
+ */
+ public void resetScores() {
+ Arrays.fill(scores, 0);
+ }
+
+ /**
+ * Gets file path by an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @return String - file path for an army at the army index number.
+ */
+ public String getFilePathByNumber(int armyNumber) {
+ return filePaths[armyNumber];
+ }
+
+ /**
+ * Sets file path at an army index number.
+ *
+ * @param armyNumber int - the index of the army.
+ * @param filePath String - file path for an army at the army index number.
+ */
+ public void setFilePathByNumber(int armyNumber, String filePath) {
+ filePaths[armyNumber] = filePath;
+ }
+
+ /**
+ * Gets a list of all lines skipped when importing an army.
+ *
+ * @return importedLinesSkipped - List - which lines were skipped during importing and why.
+ */
+ public List<String> getImportedLinesSkipped() {
+ return importedLinesSkipped;
+ }
+
+ /**
+ * Sets which lines were skipped during import.
+ *
+ * @param importedLinesSkipped List - which lines were skipped during importing and why.
+ */
+ public void setImportedLinesSkipped(List<String> importedLinesSkipped) {
+ this.importedLinesSkipped = importedLinesSkipped;
+ }
+
+ /**
+ * Gets the amount of armies.
+ *
+ * @return int - amount of armies.
+ */
+ public int getArmiesAmount() {
+ return amountOfArmies;
+ }
+
+ /**
+ * Gets the current army number.
+ *
+ * @return int - the current army number.
+ */
+ public int getCurrentArmyNumber() {
+ return currentArmyNumber;
+ }
+
+ /**
+ * Sets current army index number.
+ *
+ * @param armyNumber int - army index number.
+ */
+ public void setCurrentArmyNumber(int armyNumber) {
+ this.currentArmyNumber = armyNumber;
+ }
+
+ /**
+ * Gets current army by current number.
+ *
+ * @return Army - the current army at the current army index number.
+ */
+ public Army getCurrentArmyByCurrentNumber() {
+ return currentArmies[getCurrentArmyNumber()];
+ }
+}
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java
index 929a340..91a14e9 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java
@@ -3,6 +3,7 @@ package edu.ntnu.idatt2001.carljgu.client.controllers;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
import edu.ntnu.idatt2001.carljgu.battle.Battle;
import edu.ntnu.idatt2001.carljgu.client.App;
+import edu.ntnu.idatt2001.carljgu.client.BattleSimulationSingleton;
import edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException;
import edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler;
import edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBox;
@@ -32,7 +33,7 @@ import static javafx.scene.control.Alert.AlertType.*;
* This includes requesting to import
* armies and simulate the battle
*
- * @version 1.9 14.05.2022
+ * @version 2.0 14.05.2022
* @author Carl Gützkow
*/
public class BattleController implements Initializable {
@@ -50,24 +51,6 @@ public class BattleController implements Initializable {
@FXML private ListView<String> attackList;
@FXML private Label lastSimulation, score;
- private final static String[] filePaths = new String[2];
- private final int[] scores = new int[2];
-
- private Army armyOne, armyTwo;
- private static Army[] originalArmies;
- private Battle battle;
-
- /**
- * Inserts an army into the originalArmies table
- * Useful for sending armies across controllers.
- *
- * @param armyNumber int - the insertion index for the army.
- * @param army Army - the army to insert into the table.
- */
- public static void setOriginalArmy(int armyNumber, Army army) {
- originalArmies[armyNumber] = army;
- }
-
/**
* Imports an army for the first army.
* Uses the system's file explorer to find the file.
@@ -96,30 +79,30 @@ public class BattleController implements Initializable {
*/
private void importArmy(int armyNumber) {
ArmyFileHandler fileHandler = new ArmyFileHandler();
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
try {
-
String filePath = fileHandler.getFilePath("OPEN");
if (filePath != null)
- filePaths[armyNumber] = filePath;
+ simulation.setFilePathByNumber(armyNumber, filePath);
else
return;
- originalArmies[armyNumber] = fileHandler.readArmyFromFile(filePaths[armyNumber]);
- displayArmy(armyNumber, originalArmies[armyNumber]);
+ simulation.setOriginalArmyByNumber(armyNumber, fileHandler.readArmyFromFile(simulation.getFilePathByNumber(armyNumber)));
+ displayArmy(armyNumber);
- List<String> linesSkipped = fileHandler.getReadLinesSkipped();
+ simulation.setImportedLinesSkipped(fileHandler.getReadLinesSkipped());
DialogBoxBuilder dialogBoxBuilder = new DialogBoxBuilder(INFORMATION)
.setTitle("Army imported")
.setMessage("Army was successfully imported.");
- if (linesSkipped.size() > 0) {
+ if (simulation.getImportedLinesSkipped().size() > 0) {
dialogBoxBuilder.setMessage(
dialogBoxBuilder.getMessage() + "\n" +
- "In the process " + linesSkipped.size() + " units were corrupted.\n" +
+ "In the process " + simulation.getImportedLinesSkipped().size() + " units were corrupted.\n" +
"Expand the \"Show details\" button to see all corrupted lines."
)
- .setListMessage(linesSkipped);
+ .setListMessage(simulation.getImportedLinesSkipped());
try {
Path currentPath = Paths.get("").toAbsolutePath();
String imagePath = Paths.get(currentPath.toString(), "src","main","resources","icons", "corrupt-file.png").toString();
@@ -146,13 +129,11 @@ public class BattleController implements Initializable {
.setMessage(e.getMessage())
.build().showAndWait();
}
- scores[0] = 0;
- scores[1] = 0;
- score.setText(scores[0] + " - " + scores[1]);
+ simulation.resetScores();
+ score.setText(simulation.getScoreByNumber(0) + " - " + simulation.getScoreByNumber(0));
- boolean bothArmiesNotImported = originalArmies[0] == null || originalArmies[1] == null;
- resetArmiesButton.setDisable(bothArmiesNotImported);
- resetAndBattleButton.setDisable(bothArmiesNotImported);
+ resetArmiesButton.setDisable(simulation.atLestOneOriginalArmyIsNull());
+ resetAndBattleButton.setDisable(simulation.atLestOneOriginalArmyIsNull());
}
/**
@@ -164,20 +145,25 @@ public class BattleController implements Initializable {
*/
@FXML public boolean resetArmies() {
UnitFactory factory = new UnitFactory();
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
boolean result = false;
try {
- List<Unit> unitsOne = factory.deepCopyBasicUnits(originalArmies[0].getAllUnits());
- List<Unit> unitsTwo = factory.deepCopyBasicUnits(originalArmies[1].getAllUnits());
- armyOne = new Army(originalArmies[0].getName(), unitsOne);
- armyTwo = new Army(originalArmies[1].getName(), unitsTwo);
+ IntStream.range(0, simulation.getArmiesAmount()).forEach(armyNumber ->
+ simulation.setCurrentArmyByNumber(armyNumber,
+ new Army(simulation.getCurrentArmyByNumber(armyNumber).getName(),
+ factory.deepCopyBasicUnits(simulation.getOriginalArmyByNumber(armyNumber).getAllUnits())))
+ );
- battle = new Battle(armyOne, armyTwo, Terrain.getTerrain(terrainChoiceBox.getValue()));
+ simulation.setBattle(new Battle(
+ simulation.getCurrentArmyByNumber(0),
+ simulation.getCurrentArmyByNumber(1),
+ Terrain.getTerrain(terrainChoiceBox.getValue())));
attackList.getItems().clear();
- displayArmy(0, armyOne);
- displayArmy(1, armyTwo);
+ displayArmy(0);
+ displayArmy(1);
result = true;
} catch (IllegalArgumentException e) {
@@ -185,7 +171,7 @@ public class BattleController implements Initializable {
.setMessage(e.getMessage())
.build().showAndWait();
} catch (NullPointerException e) {
- new DialogBoxBuilder(NONE)
+ new DialogBoxBuilder(ERROR)
.setTitle("Army does not exist")
.setMessage("Armies have not been imported")
.build().showAndWait();
@@ -203,18 +189,20 @@ public class BattleController implements Initializable {
if (!resetArmies())
return;
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
try {
- Army winningArmy = battle.simulate();
+ Army winningArmy = simulation.getBattle().simulate();
- attackList.getItems().addAll(battle.getAttackLog());
+ attackList.getItems().addAll(simulation.getBattle().getAttackLog());
- if (winningArmy.equals(armyOne)) scores[0]++;
- else scores[1]++;
- score.setText(scores[0] + " - " + scores[1]);
+ if (winningArmy.equals(simulation.getCurrentArmyByNumber(0))) simulation.incrementScore(0);
+ else simulation.incrementScore(1);
+ score.setText(simulation.getScoreByNumber(0) + " - " + simulation.getScoreByNumber(1));
lastSimulation.setText(winningArmy.getName());
- displayArmy(0, armyOne);
- displayArmy(1, armyTwo);
+ displayArmy(0);
+ displayArmy(1);
} catch (UnsupportedOperationException | NullPointerException e) {
new DialogBoxBuilder(ERROR)
.setMessage(e.getMessage())
@@ -229,18 +217,19 @@ public class BattleController implements Initializable {
* have changed. For example after a battle.
*
* @param armyNumber int - 0 or 1 depending on which elements to use to display an army.
- * @param army Army - the army to display.
* @throws NullPointerException thrown if the army is null
*/
- public void displayArmy(int armyNumber, Army army) throws NullPointerException {
+ public void displayArmy(int armyNumber) throws NullPointerException {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+ Army army = simulation.getCurrentArmyByNumber(armyNumber);
if (army == null) throw new NullPointerException("Army is a a null object");
armyNameLabels[armyNumber].setText(army.getName());
armySummaryLabels[armyNumber].setText(army.strengthAndUnitRepresentation());
- armyImportPathLabels[armyNumber].setText(filePaths[armyNumber]);
+ armyImportPathLabels[armyNumber].setText(simulation.getFilePathByNumber(armyNumber));
- editArmyButtons[armyNumber].setDisable(originalArmies[armyNumber] == null);
+ editArmyButtons[armyNumber].setDisable(simulation.getOriginalArmyByNumber(armyNumber) == null);
armyUnitListViews[armyNumber].setItems((ObservableList<Unit>) army.getAllUnits());
}
@@ -250,13 +239,15 @@ public class BattleController implements Initializable {
* @param armyNumber int - the specified army's number to edit
*/
public void editArmy(int armyNumber) {
- if (originalArmies[armyNumber] == null) {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+ if (simulation.getOriginalArmyByNumber(armyNumber) == null) {
new DialogBoxBuilder(ERROR)
.setMessage("Army is not imported.")
.build().showAndWait();
return;
}
- EditArmyController.setArmyToEdit(originalArmies[armyNumber], armyNumber);
+ simulation.setCurrentArmyByNumber(armyNumber, simulation.getOriginalArmyByNumber(armyNumber));
+ simulation.setCurrentArmyNumber(armyNumber);
App.changeScene("edit-army.fxml");
}
@@ -281,6 +272,7 @@ public class BattleController implements Initializable {
* to edit a new army.
*/
public void createArmy() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
DialogBox dialog = new DialogBoxBuilder(INFORMATION)
.setMessage("Which side do you want to create an army for?")
@@ -302,7 +294,8 @@ public class BattleController implements Initializable {
armyNumber = 0;
else
armyNumber = 1;
- EditArmyController.setArmyToEdit(new Army("New army"), armyNumber);
+ simulation.setCurrentArmyNumber(armyNumber);
+ simulation.setCurrentArmyByNumber(armyNumber, new Army("New army"));
App.changeScene("edit-army.fxml");
}
@@ -321,17 +314,13 @@ public class BattleController implements Initializable {
armyUnitListViews = new ListView[] {armyOneUnitsListView, armyTwoUnitsListView};
editArmyButtons = new Button[] {editArmyOneButton, editArmyTwoButton};
- if (originalArmies == null)
- originalArmies = new Army[] {armyOne, armyTwo};
- else {
- IntStream.range(0,originalArmies.length).forEach(armyNumber -> {
- if (originalArmies[armyNumber] != null) displayArmy(armyNumber, originalArmies[armyNumber]);
- });
- }
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+ IntStream.range(0, simulation.getArmiesAmount()).forEach(armyNumber -> {
+ if (simulation.getOriginalArmyByNumber(armyNumber) != null) displayArmy(armyNumber);
+ });
- boolean bothArmiesNotImported = originalArmies[0] == null || originalArmies[1] == null;
- resetArmiesButton.setDisable(bothArmiesNotImported);
- resetAndBattleButton.setDisable(bothArmiesNotImported);
+ resetArmiesButton.setDisable(simulation.atLestOneOriginalArmyIsNull());
+ resetAndBattleButton.setDisable(simulation.atLestOneOriginalArmyIsNull());
Arrays.stream(Terrain.values()).forEach(s -> terrainChoiceBox.getItems().add(s.getReadableName()));
terrainChoiceBox.setValue(Terrain.PLAINS.getReadableName());
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java
index 7c2ef53..d6f6944 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java
@@ -1,10 +1,10 @@
package edu.ntnu.idatt2001.carljgu.client.controllers;
import edu.ntnu.idatt2001.carljgu.client.App;
+import edu.ntnu.idatt2001.carljgu.client.BattleSimulationSingleton;
import edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler;
import edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException;
import edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder;
-import edu.ntnu.idatt2001.carljgu.battle.Army;
import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory;
import edu.ntnu.idatt2001.carljgu.battle.units.UnitType;
@@ -46,34 +46,18 @@ public class EditArmyController implements Initializable {
@FXML public ListView<String> changelogListView;
@FXML public HBox hboxRoot;
- private static Army deepCopiedArmy;
- private static int armyNumber;
private ObservableList<String> observableChangelog;
- /**
- * Sets army to edit.
- * Called from the BattleController to set
- * the army to edit.
- *
- * @param armyToEdit the army to edit
- * @param armyNumberToEdit int - the selected army to import.
- * 0 for army one and 1 for army two
- */
- public static void setArmyToEdit(Army armyToEdit, int armyNumberToEdit) {
- armyNumber = armyNumberToEdit;
- UnitFactory factory = new UnitFactory();
- List<Unit> deepCopiedUnits = factory.deepCopyBasicUnits(armyToEdit.getAllUnits());
- deepCopiedArmy = new Army(armyToEdit.getName(), deepCopiedUnits);
- }
-
/**
* Called for updating the army's name.
*/
@FXML public void editArmyName() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
String newName = editNameField.getText();
try {
- deepCopiedArmy.setName(newName);
- updateAllFields();
+ simulation.getCurrentArmyByCurrentNumber().setName(newName);
+ updateComponentsWithInformation();
displaySuccessfulPopupMessage("Name of army was successfully changed.");
observableChangelog.add("✎ Changed name to " + newName);
} catch (IllegalArgumentException e) {
@@ -90,6 +74,8 @@ public class EditArmyController implements Initializable {
* and their unit type.
*/
@FXML public void addUnits() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
String unitTypeClassName = unitsTypeComboBox.getValue();
int amountOfUnits = amountOfUnitsSpinner.getValue();
int unitsHealth = unitsHealthSpinner.getValue();
@@ -99,8 +85,8 @@ public class EditArmyController implements Initializable {
try {
List<Unit> units = factory.createListOfUnits(amountOfUnits, UnitType.getUnitType(unitTypeClassName), unitsName, unitsHealth);
- deepCopiedArmy.addUnits(units);
- updateAllFields();
+ simulation.getCurrentArmyByCurrentNumber().addUnits(units);
+ updateComponentsWithInformation();
displaySuccessfulPopupMessage("Successfully added to army.");
observableChangelog.add("âž• Created " + amountOfUnits + " " + unitTypeClassName + ((amountOfUnits > 1) ? "s" : ""));
} catch (IllegalArgumentException e) {
@@ -114,11 +100,13 @@ public class EditArmyController implements Initializable {
* Called for deleting a unit.
*/
@FXML public void deleteUnit() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
Unit unitToDelete = allUnitsComboBox.getValue();
try {
- boolean couldDelete = deepCopiedArmy.remove(unitToDelete);
+ boolean couldDelete = simulation.getCurrentArmyByCurrentNumber().remove(unitToDelete);
if (couldDelete) {
- updateAllFields();
+ updateComponentsWithInformation();
displaySuccessfulPopupMessage("Unit was successfully deleted.");
observableChangelog.add("✖ Deleted " + unitToDelete.getClassName() + " " + unitToDelete.getName());
}
@@ -147,12 +135,14 @@ public class EditArmyController implements Initializable {
* Writes the changed army to a csv file.
*/
@FXML public void writeToCSV() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
ArmyFileHandler fileHandler = new ArmyFileHandler();
String filePath = fileHandler.getFilePath("SAVE");
if (filePath == null)
return;
try {
- fileHandler.writeToFile(deepCopiedArmy, filePath);
+ fileHandler.writeToFile(simulation.getCurrentArmyByCurrentNumber(), filePath);
displaySuccessfulPopupMessage("Army was successfully written to file.");
} catch (IOException e) {
new DialogBoxBuilder(ERROR)
@@ -171,12 +161,14 @@ public class EditArmyController implements Initializable {
* Sets the original army to the deep copied army.
*/
@FXML public void updateArmyAndGoBack() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
Optional<ButtonType> result = new DialogBoxBuilder(CONFIRMATION)
.setMessage("Are you sure you want to commit these changes? \n" +
"You will be returned to the battle page.")
.build().showAndWait();
if (result.isPresent() && result.get().equals(ButtonType.OK)) {
- BattleController.setOriginalArmy(armyNumber, deepCopiedArmy);
+ simulation.setOriginalArmyByNumber(simulation.getCurrentArmyNumber(), simulation.getCurrentArmyByCurrentNumber());
+
App.changeScene("battle-armies.fxml");
}
@@ -205,15 +197,17 @@ public class EditArmyController implements Initializable {
/**
* Update all fields and labels with updated information.
*/
- public void updateAllFields() {
- editArmyTitle.setText("Editing " + deepCopiedArmy.getName());
+ public void updateComponentsWithInformation() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
+ editArmyTitle.setText("Editing " + simulation.getCurrentArmyByCurrentNumber().getName());
editNameField.setText("");
unitsNameField.setText("");
unitsTypeComboBox.getItems().clear();
Arrays.stream(UnitType.values()).forEach(s -> unitsTypeComboBox.getItems().add(s.getClassName()));
unitsTypeComboBox.setValue(UnitType.INFANTRY_UNIT.getClassName());
- armyToString.setText(deepCopiedArmy.strengthAndUnitRepresentation());
+ armyToString.setText(simulation.getCurrentArmyByCurrentNumber().strengthAndUnitRepresentation());
}
/**
@@ -221,6 +215,8 @@ public class EditArmyController implements Initializable {
* buttons to disabled if input is invalid.
*/
public void addEventListenersToFieldsAndLists() {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
editNameField.textProperty().addListener(((observable, ignored, newValue) -> editArmyNameButton.setDisable(newValue.isBlank())));
editArmyNameButton.setDisable(true);
unitsNameField.textProperty().addListener(((observable, ignored, newValue) -> addUnitsButton.setDisable(newValue.isBlank())));
@@ -230,8 +226,8 @@ public class EditArmyController implements Initializable {
observableChangelog = FXCollections.observableArrayList();
changelogListView.setItems(observableChangelog);
- armyUnitsListView.setItems((ObservableList<Unit>) deepCopiedArmy.getAllUnits());
- allUnitsComboBox.setItems((ObservableList<Unit>) deepCopiedArmy.getAllUnits());
+ armyUnitsListView.setItems((ObservableList<Unit>) simulation.getCurrentArmyByCurrentNumber().getAllUnits());
+ allUnitsComboBox.setItems((ObservableList<Unit>) simulation.getCurrentArmyByCurrentNumber().getAllUnits());
}
/**
@@ -243,10 +239,12 @@ public class EditArmyController implements Initializable {
*/
@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
- if (deepCopiedArmy == null) {
+ BattleSimulationSingleton simulation = BattleSimulationSingleton.getBattleSimulation();
+
+ if (simulation.getCurrentArmyByCurrentNumber() == null) {
return;
}
- updateAllFields();
+ updateComponentsWithInformation();
addEventListenersToFieldsAndLists();
SpinnerValueFactory<Integer> amountValueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 9999);
@@ -254,6 +252,5 @@ public class EditArmyController implements Initializable {
healthValueFactory.setValue(10);
amountOfUnitsSpinner.setValueFactory(amountValueFactory);
unitsHealthSpinner.setValueFactory(healthValueFactory);
-
}
}
--
GitLab
From 5696289bad8ea83dff4311e621c2e49e46bab784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20G=C3=BCtzkow?= <cjgutzkow@gmail.com>
Date: Fri, 20 May 2022 20:20:25 +0200
Subject: [PATCH 2/2] refactor: moved tests to other packages
---
javadoc/allclasses-index.html | 2 +-
javadoc/allpackages-index.html | 2 +-
javadoc/constant-values.html | 2 +-
javadoc/deprecated-list.html | 2 +-
.../edu/ntnu/idatt2001/carljgu/battle/Army.html | 2 +-
.../ntnu/idatt2001/carljgu/battle/Battle.html | 2 +-
.../carljgu/battle/SimulationAttack.html | 2 +-
.../ntnu/idatt2001/carljgu/battle/Terrain.html | 2 +-
.../carljgu/battle/package-summary.html | 2 +-
.../idatt2001/carljgu/battle/package-tree.html | 2 +-
.../idatt2001/carljgu/battle/units/Unit.html | 2 +-
.../carljgu/battle/units/UnitFactory.html | 2 +-
.../idatt2001/carljgu/battle/units/UnitType.html | 2 +-
.../carljgu/battle/units/package-summary.html | 2 +-
.../carljgu/battle/units/package-tree.html | 2 +-
.../battle/units/specialized/CavalryUnit.html | 2 +-
.../battle/units/specialized/CommanderUnit.html | 2 +-
.../battle/units/specialized/InfantryUnit.html | 2 +-
.../battle/units/specialized/RangedUnit.html | 2 +-
.../units/specialized/package-summary.html | 2 +-
.../battle/units/specialized/package-tree.html | 2 +-
.../edu/ntnu/idatt2001/carljgu/client/App.html | 2 +-
.../client/BattleSimulationSingleton.html | 2 +-
.../edu/ntnu/idatt2001/carljgu/client/Main.html | 2 +-
.../client/controllers/BattleController.html | 2 +-
.../client/controllers/EditArmyController.html | 16 ++++++++--------
.../client/controllers/package-summary.html | 2 +-
.../carljgu/client/controllers/package-tree.html | 2 +-
.../carljgu/client/dialogs/DialogBox.html | 2 +-
.../carljgu/client/dialogs/DialogBoxBuilder.html | 2 +-
.../carljgu/client/dialogs/package-summary.html | 2 +-
.../carljgu/client/dialogs/package-tree.html | 2 +-
.../carljgu/client/package-summary.html | 2 +-
.../idatt2001/carljgu/client/package-tree.html | 2 +-
.../carljgu/filehandling/ArmyFileHandler.html | 2 +-
.../filehandling/FileExtensionException.html | 2 +-
.../carljgu/filehandling/package-summary.html | 2 +-
.../carljgu/filehandling/package-tree.html | 2 +-
.../module-summary.html | 2 +-
javadoc/help-doc.html | 2 +-
javadoc/index-files/index-1.html | 2 +-
javadoc/index-files/index-10.html | 2 +-
javadoc/index-files/index-11.html | 2 +-
javadoc/index-files/index-12.html | 2 +-
javadoc/index-files/index-13.html | 2 +-
javadoc/index-files/index-14.html | 2 +-
javadoc/index-files/index-15.html | 10 +++++-----
javadoc/index-files/index-16.html | 2 +-
javadoc/index-files/index-17.html | 2 +-
javadoc/index-files/index-2.html | 2 +-
javadoc/index-files/index-3.html | 2 +-
javadoc/index-files/index-4.html | 2 +-
javadoc/index-files/index-5.html | 2 +-
javadoc/index-files/index-6.html | 2 +-
javadoc/index-files/index-7.html | 2 +-
javadoc/index-files/index-8.html | 2 +-
javadoc/index-files/index-9.html | 2 +-
javadoc/index.html | 2 +-
javadoc/member-search-index.js | 2 +-
javadoc/overview-tree.html | 2 +-
javadoc/serialized-form.html | 2 +-
src/main/resources/battle-armies.fxml | 2 +-
.../carljgu/{ => units}/UnitFactoryTest.java | 2 +-
.../carljgu/{ => units}/UnitTypeTest.java | 2 +-
.../carljgu/{ => units}/WarUnitTest.java | 2 +-
.../{ => units}/specialized/CavalryTest.java | 2 +-
.../{ => units}/specialized/CommanderTest.java | 2 +-
.../{ => units}/specialized/InfantryTest.java | 2 +-
.../{ => units}/specialized/RangedTest.java | 2 +-
69 files changed, 80 insertions(+), 80 deletions(-)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/UnitFactoryTest.java (98%)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/UnitTypeTest.java (96%)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/WarUnitTest.java (99%)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/specialized/CavalryTest.java (97%)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/specialized/CommanderTest.java (97%)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/specialized/InfantryTest.java (97%)
rename src/test/java/edu/ntnu/idatt2001/carljgu/{ => units}/specialized/RangedTest.java (97%)
diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html
index 47c401e..eb85ad5 100644
--- a/javadoc/allclasses-index.html
+++ b/javadoc/allclasses-index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>All Classes and Interfaces</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html
index bc9aaa7..b4c3daf 100644
--- a/javadoc/allpackages-index.html
+++ b/javadoc/allpackages-index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>All Packages</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index fc7f849..46250a9 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Constant Field Values</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index 3e3a27f..5ab052a 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Deprecated List</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
index 963d07a..b7e87d8 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Army</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
index d638275..4542be1 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Battle</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
index 316ef97..353c2eb 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>SimulationAttack</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
index 8b91455..f7f45be 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Terrain</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
index 2d60586..6517f51 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
index 2bb4c96..de5c53c 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
index ea47c75..d023fdd 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Unit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
index 82f2a0a..ba55559 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>UnitFactory</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
index 538557c..4aa7cc3 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>UnitType</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
index de722ed..3f02e25 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
index a9fcdd7..1667395 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
index 51ea22e..8671473 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>CavalryUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
index 306c348..dcc12e1 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>CommanderUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
index 6b11c04..c44ccbd 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>InfantryUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
index ba1eff0..6241731 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>RangedUnit</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
index 1ff52f5..32ae846 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units.specialized</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
index 1435b49..402afc2 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle.units.specialized Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
index 1b39221..70314b5 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>App</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
index 18007e3..78bff91 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>BattleSimulationSingleton</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
index be68bce..d1c71a1 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Main</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
index 24a3a62..2f38f1e 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>BattleController</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
index 6fbbde3..45810a9 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>EditArmyController</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -214,14 +214,14 @@ implements javafx.fxml.Initializable</span></div>
<div class="block">Run when the fxml file is first loaded.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateAllFields()" class="member-name-link">updateAllFields</a>()</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Update all fields and labels with updated information.</div>
+<div class="block">Update army and go back.</div>
</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack</a>()</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateComponentsWithInformation()" class="member-name-link">updateComponentsWithInformation</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Update army and go back.</div>
+<div class="block">Update all fields and labels with updated information.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#writeToCSV()" class="member-name-link">writeToCSV</a>()</code></div>
@@ -414,9 +414,9 @@ implements javafx.fxml.Initializable</span></div>
</section>
</li>
<li>
-<section class="detail" id="updateAllFields()">
-<h3>updateAllFields</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">updateAllFields</span>()</div>
+<section class="detail" id="updateComponentsWithInformation()">
+<h3>updateComponentsWithInformation</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">updateComponentsWithInformation</span>()</div>
<div class="block">Update all fields and labels with updated information.</div>
</section>
</li>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
index e37cb9d..fc23238 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.controllers</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
index f38bcc5..4b332b4 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.controllers Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
index 953c682..318f215 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>DialogBox</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
index 4f2f51b..d6a13ae 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>DialogBoxBuilder</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
index 7c4d101..f2fe18e 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.dialogs</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
index 64e0706..e9af8e2 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.dialogs Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
index 56088d9..2908c6a 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
index cb29930..76d87d7 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
index 4bec739..d5abc93 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>ArmyFileHandler</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
index ffde5e5..4ae0f36 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>FileExtensionException</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
index 636d51c..f3fd1db 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.filehandling</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
index bb6be76..f4b3af7 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.filehandling Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
index e1bec25..1246871 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 7b6d1c8..215f8fe 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>API Help</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html
index 3baa881..4554f14 100644
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>A-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-10.html b/javadoc/index-files/index-10.html
index bd90fef..d288cdf 100644
--- a/javadoc/index-files/index-10.html
+++ b/javadoc/index-files/index-10.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>M-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-11.html b/javadoc/index-files/index-11.html
index 9d67fa8..2954613 100644
--- a/javadoc/index-files/index-11.html
+++ b/javadoc/index-files/index-11.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>P-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-12.html b/javadoc/index-files/index-12.html
index 35c74b1..e3fa953 100644
--- a/javadoc/index-files/index-12.html
+++ b/javadoc/index-files/index-12.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>R-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-13.html b/javadoc/index-files/index-13.html
index 160e7bb..0a49328 100644
--- a/javadoc/index-files/index-13.html
+++ b/javadoc/index-files/index-13.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>S-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-14.html b/javadoc/index-files/index-14.html
index 51c287a..206194b 100644
--- a/javadoc/index-files/index-14.html
+++ b/javadoc/index-files/index-14.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>T-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-15.html b/javadoc/index-files/index-15.html
index 40f3e3b..d379c55 100644
--- a/javadoc/index-files/index-15.html
+++ b/javadoc/index-files/index-15.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>U-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -79,14 +79,14 @@ loadScripts(document, 'script');</script>
<div class="block">An enum that represents the different unit types
that an army can contain.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#updateAllFields()" class="member-name-link">updateAllFields()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
-<dd>
-<div class="block">Update all fields and labels with updated information.</div>
-</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Update army and go back.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#updateComponentsWithInformation()" class="member-name-link">updateComponentsWithInformation()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
+<dd>
+<div class="block">Update all fields and labels with updated information.</div>
+</dd>
</dl>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a></main>
</div>
diff --git a/javadoc/index-files/index-16.html b/javadoc/index-files/index-16.html
index 5240df5..10208a8 100644
--- a/javadoc/index-files/index-16.html
+++ b/javadoc/index-files/index-16.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>V-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-17.html b/javadoc/index-files/index-17.html
index f01df32..53a9cbc 100644
--- a/javadoc/index-files/index-17.html
+++ b/javadoc/index-files/index-17.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>W-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html
index bf27730..42e9ded 100644
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>B-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html
index e03c667..a8d6133 100644
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>C-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html
index 5417253..8895bd2 100644
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>D-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html
index f6d78b3..305a2ef 100644
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>E-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html
index 66da2e4..c522a74 100644
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>F-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html
index 1282faf..7866833 100644
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>G-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-8.html b/javadoc/index-files/index-8.html
index 8e93dc3..a1e7cb6 100644
--- a/javadoc/index-files/index-8.html
+++ b/javadoc/index-files/index-8.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>H-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-9.html b/javadoc/index-files/index-9.html
index 1bbd601..31deb0c 100644
--- a/javadoc/index-files/index-9.html
+++ b/javadoc/index-files/index-9.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>I-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index.html b/javadoc/index.html
index 416b4f4..905016c 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Generated Documentation (Untitled)</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js
index 09c285b..9b1c93f 100644
--- a/javadoc/member-search-index.js
+++ b/javadoc/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"atLestOneOriginalArmyIsNull()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"displayArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getArmiesAmount()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattle()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattleSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByCurrentNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getFilePathByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getImportedLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getOriginalArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getScoreByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"hboxRoot"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"incrementScore(int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"resetScores()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setBattle(Battle)","u":"setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyByNumber(int, Army)","u":"setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setFilePathByNumber(int, String)","u":"setFilePathByNumber(int,java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setImportedLinesSkipped(List<String>)","u":"setImportedLinesSkipped(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setOriginalArmyByNumber(int, Army)","u":"setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setScoreByNumber(int, int)","u":"setScoreByNumber(int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)"}];updateSearchResults();
\ No newline at end of file
+memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"atLestOneOriginalArmyIsNull()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"displayArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getArmiesAmount()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattle()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattleSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByCurrentNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getFilePathByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getImportedLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getOriginalArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getScoreByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"hboxRoot"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"incrementScore(int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"resetScores()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setBattle(Battle)","u":"setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyByNumber(int, Army)","u":"setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setFilePathByNumber(int, String)","u":"setFilePathByNumber(int,java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setImportedLinesSkipped(List<String>)","u":"setImportedLinesSkipped(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setOriginalArmyByNumber(int, Army)","u":"setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setScoreByNumber(int, int)","u":"setScoreByNumber(int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateComponentsWithInformation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index 9b1d3a5..e9bbbeb 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
index fc9d3d5..40443ed 100644
--- a/javadoc/serialized-form.html
+++ b/javadoc/serialized-form.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Fri May 20 19:20:14 CEST 2022 -->
+<!-- Generated by javadoc (17) on Fri May 20 20:18:24 CEST 2022 -->
<title>Serialized Form</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/src/main/resources/battle-armies.fxml b/src/main/resources/battle-armies.fxml
index 0b3918f..48daebc 100644
--- a/src/main/resources/battle-armies.fxml
+++ b/src/main/resources/battle-armies.fxml
@@ -143,7 +143,7 @@
<Font name="Arial" size="20.0" />
</font>
</Label>
- <TitledPane maxHeight="1.7976931348623157E308" minHeight="200.0" text="Simulation attack log. Earliest first" VBox.vgrow="ALWAYS">
+ <TitledPane maxHeight="1.7976931348623157E308" minHeight="200.0" text="Simulation attack log. Earliest first" VBox.vgrow="ALWAYS" animated="false" collapsible="false">
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="20.0" />
</VBox.margin>
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/UnitFactoryTest.java
similarity index 98%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/UnitFactoryTest.java
index 2081268..560a939 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/UnitFactoryTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu;
+package edu.ntnu.idatt2001.carljgu.units;
import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/UnitTypeTest.java
similarity index 96%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/UnitTypeTest.java
index 681825b..c485b67 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/UnitTypeTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu;
+package edu.ntnu.idatt2001.carljgu.units;
import edu.ntnu.idatt2001.carljgu.battle.units.UnitType;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/WarUnitTest.java
similarity index 99%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/WarUnitTest.java
index 2362be2..81b7f54 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/WarUnitTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu;
+package edu.ntnu.idatt2001.carljgu.units;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryTest.java
similarity index 97%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryTest.java
index f2779d9..40ce0d2 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.specialized;
+package edu.ntnu.idatt2001.carljgu.units.specialized;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderTest.java
similarity index 97%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderTest.java
index a26c3a8..192810d 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.specialized;
+package edu.ntnu.idatt2001.carljgu.units.specialized;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryTest.java
similarity index 97%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryTest.java
index 8e67c38..0299a70 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.specialized;
+package edu.ntnu.idatt2001.carljgu.units.specialized;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/RangedTest.java
similarity index 97%
rename from src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java
rename to src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/RangedTest.java
index e2f5a6a..328e848 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/units/specialized/RangedTest.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.specialized;
+package edu.ntnu.idatt2001.carljgu.units.specialized;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
--
GitLab