From 81cb2f33ffc70ebfab422200340cf6febef8a748 Mon Sep 17 00:00:00 2001 From: Hanno Fleischer Date: Tue, 3 Dec 2024 17:56:39 +0100 Subject: [PATCH] adjusted all constuctors of nodes so that if someone creates a node the piece will be null and the option for a constuctor without arguments is still given for serialization purposes --- Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java | 2 +- .../mdga/model/src/main/java/pp/mdga/game/BonusNode.java | 2 +- .../mdga/model/src/main/java/pp/mdga/game/HomeNode.java | 2 +- Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java | 6 +++++- .../mdga/model/src/main/java/pp/mdga/game/StartNode.java | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java index b24382fe..b46ef62f 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java @@ -29,7 +29,7 @@ public Board() { } else if (i == 4 || i == 14 || i == 24 || i == 34) { infield[i] = new BonusNode(); } else { - infield[i] = new Node(); + infield[i] = new Node(null); } } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusNode.java index c12f7cab..8ece5b1e 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusNode.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/BonusNode.java @@ -8,6 +8,6 @@ @Serializable public class BonusNode extends Node { BonusNode(){ - super(); + super(null); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/HomeNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/HomeNode.java index 814abaa5..cb373011 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/HomeNode.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/HomeNode.java @@ -8,6 +8,6 @@ @Serializable public class HomeNode extends Node { public HomeNode() { - super(); + super(null); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java index 59738c1c..921ea970 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Node.java @@ -9,7 +9,11 @@ public class Node { protected Piece occupant; - public Node(){ + public Node(Piece piece){ + occupant = piece; + } + + private Node(){ occupant = new Piece(Color.AIRFORCE, PieceState.WAITING); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java index 24b2c267..c8c79264 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/StartNode.java @@ -18,10 +18,12 @@ public class StartNode extends Node { * @param color the color of the node */ public StartNode(Color color) { + super(null); this.color = color; } private StartNode() { + super(null); color = Color.NONE; }