Enhance/method enhancement

src/main/java/edu/ntnu/idatt1002/k1g4/Division.java

@@ -99,11 +99,14 @@ public class Division {
      *
      * @return          a list of competing teams.
      */
-    //TODO: This may have to be altered?
-    public HashMap<Integer, Team> getCompetingTeams() {
-        HashMap<Integer, Team> shallowCopy = new HashMap<>();
-        shallowCopy = (HashMap<Integer, Team>) competingTeams.clone();
-        return shallowCopy;
+    public HashMap<String, Team> getCompetingTeams() {
+        HashMap<String, Team> copy = new HashMap<>();
+
+        for (Team team : competingTeams.values()) {
+            Team deepCopiedTeam = new Team(team.getName(), team.getMembers(), team.isCompeting());
+            copy.put(deepCopiedTeam.getName(), deepCopiedTeam);
+        }
+        return copy;
     }
 
     /**
@@ -123,10 +126,10 @@ public class Division {
     /**
      * Gets age group and sex of the division.
      *
-     * @return the age group and sex of the division
+     * @return      ToString of the division; age group and sex of the division.
      */
-    public DivisionType getDivisionType() {
-        return divisionType;
+    public String getDivisionType() {
+        return divisionType.toString();
     }
 
 }

src/main/java/edu/ntnu/idatt1002/k1g4/Match.java

@@ -23,8 +23,8 @@ class Match {
     private final int fieldNumber;
     private boolean isFinished;
     private boolean isWalkover;
-    private DivisionType divisionType;
-                                        //TODO: Add static unique match id as for class Person? Issue on GitLab.
+    private final DivisionType divisionType;
+
     /**
      * Instantiates a new Match.
      *
@@ -230,34 +230,17 @@ class Match {
         String walkoverMatch = this.isWalkover() ? "The match is a walkover" : "The match is not a walkover";
         return (
             "Match: " +
-            '\n' +
-            "Team 1: " +
-            this.getTeams()[0] +
-            '\n' +
-            "Team 2: " +
-            this.getTeams()[1] +
-            '\n' +
-            refereesString +
-            '\n' +
-            "Score: " +
-            this.getScores() +
-            '\n' +
-            "Start time: " +
-            this.getStartTime() +
-            '\n' +
-            "End time: " +
-            this.getEndTime() +
-            '\n' +
-            "Fieldnumber: " +
-            this.getFieldNumber() +
-            '\n' +
-            finishedMatch +
-            '\n' +
-            walkoverMatch +
-            '\n' +
-            "Matchtype: " +
-            this.getDivisionType() +
-            '\n'
+            "\n     Team 1:         " + this.getTeams()[0] +
+            "\n     Team 2:         " + this.getTeams()[1] +
+            "\n     " + refereesString +
+            "\n     Score:          " + this.getScores() +
+            "\n     Start time:     " + this.getStartTime() +
+            "\n     End time:       " + this.getEndTime() +
+            "\n     Field number:   " + this.getFieldNumber() +
+            "\n     " + finishedMatch +
+            "\n     " + walkoverMatch +
+            "\n     Match type:     " + this.getDivisionType() +
+            "\n"
         );
     }
 

src/main/java/edu/ntnu/idatt1002/k1g4/Team.java

@@ -78,16 +78,9 @@ public class Team {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof Team)) return false;
-        Team team = (Team) o;
-        return (
-            isCompeting == team.isCompeting &&
-            Objects.equals(name, team.name)
+        if (!(o instanceof Team team)) return false;
+        return (Objects.equals(name, team.name)
         );
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, members, isCompeting);
-    }
 }