Skip to content
Snippets Groups Projects

updated files

Merged Edvard Christian Berg Schøyen requested to merge master into main
12 files
+ 29
25
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -34,10 +34,7 @@ public class Army {
public boolean hasUnits(){
boolean hasUnites = false;
if (this.units.size() > 0){
hasUnites = true;
}
boolean hasUnites = this.units.size() > 0;
return hasUnites;
}
@@ -51,7 +48,11 @@ public class Army {
@Override
public String toString() {
return "Army " + name + " with units " + units;
String results = ": ";
for (Unit unit : units){
results += unit.toString() + " ";
}
return "The army: " + name + ", with remaining units " + results;
}
@Override
Loading