From 4d6cd63a3defcf129203f311e77e03afa1d91529 Mon Sep 17 00:00:00 2001 From: Fleischer Hanno Date: Sat, 30 Nov 2024 11:24:46 +0100 Subject: [PATCH] made all notifications constructors public --- .../mdga/notification/ActivePlayerNotification.java | 2 +- .../pp/mdga/notification/CeremonyNotification.java | 2 +- .../pp/mdga/notification/DiceNowNotification.java | 2 +- .../pp/mdga/notification/DicingNotification.java | 2 +- .../pp/mdga/notification/DrawCardNotification.java | 2 +- .../java/pp/mdga/notification/GameNotification.java | 2 +- .../pp/mdga/notification/HomeMoveNotification.java | 2 +- .../pp/mdga/notification/InterruptNotification.java | 6 +++--- .../mdga/notification/LobbyDialogNotification.java | 2 +- .../pp/mdga/notification/PlayCardNotification.java | 2 +- .../pp/mdga/notification/ResumeNotification.java | 2 +- .../pp/mdga/notification/RollDiceNotification.java | 2 +- .../notification/SelectableCardsNotification.java | 2 +- .../mdga/notification/StartDialogNotification.java | 2 +- .../pp/mdga/notification/TskSelectNotification.java | 13 +------------ .../mdga/notification/TskUnselectNotification.java | 2 +- 16 files changed, 18 insertions(+), 29 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java index e557e8ce..4efdb343 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ActivePlayerNotification.java @@ -12,7 +12,7 @@ public class ActivePlayerNotification extends Notification { */ private Color color; - ActivePlayerNotification(Color color) { + public ActivePlayerNotification(Color color) { this.color = color; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java index 3f88eb8a..20a270dc 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/CeremonyNotification.java @@ -7,6 +7,6 @@ public class CeremonyNotification extends Notification{ /** * Constructor */ - CeremonyNotification() { + public CeremonyNotification() { } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java index fce8c9b1..68064cfe 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DiceNowNotification.java @@ -8,6 +8,6 @@ public class DiceNowNotification extends Notification { /** * Constructor. */ - DiceNowNotification() { + public DiceNowNotification() { } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java index 5c1c7ecf..4e9f3145 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DicingNotification.java @@ -13,7 +13,7 @@ public class DicingNotification extends Notification{ * Constructor. * @param color The color of the player that diced. */ - DicingNotification(Color color) { + public DicingNotification(Color color) { this.color = color; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java index 2de500c0..5114fd15 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/DrawCardNotification.java @@ -15,7 +15,7 @@ public class DrawCardNotification extends Notification { * @param color the color of the player who drew the card * @param card the card that was drawn */ - DrawCardNotification(Color color, BonusCard card) { + public DrawCardNotification(Color color, BonusCard card) { this.color = color; this.card = card; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java index 90c60694..d1864bbd 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/GameNotification.java @@ -7,6 +7,6 @@ public class GameNotification extends Notification{ /** * Constructor */ - GameNotification() { + public GameNotification() { } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java index 48cecc52..ffa7d2e1 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/HomeMoveNotification.java @@ -16,7 +16,7 @@ public class HomeMoveNotification extends Notification { * @param pieceId the piece id * @param homeIndex the home index */ - HomeMoveNotification(UUID pieceId, int homeIndex) { + public HomeMoveNotification(UUID pieceId, int homeIndex) { this.pieceId = pieceId; this.homeIndex = homeIndex; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java index e9a61de6..bb8fb784 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/InterruptNotification.java @@ -10,14 +10,14 @@ public class InterruptNotification extends Notification { private Color color; /** - * @param color the color of the player who drew the card + * @param color the color of the player who disconnected */ - InterruptNotification(Color color) { + public InterruptNotification(Color color) { this.color = color; } /** - * @return the color of the player who drew the card + * @return the color of the player who disconnected */ public Color getColor() { return color; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java index 7c1a4adf..dcea5094 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/LobbyDialogNotification.java @@ -7,6 +7,6 @@ public class LobbyDialogNotification extends Notification{ /** * Constructor */ - LobbyDialogNotification() { + public LobbyDialogNotification() { } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java index d554a0e6..dd9cf9d4 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/PlayCardNotification.java @@ -16,7 +16,7 @@ public class PlayCardNotification extends Notification { * @param color the color of the player that played the card. * @param card the card that was played. */ - PlayCardNotification(Color color, BonusCard card) { + public PlayCardNotification(Color color, BonusCard card) { this.color = color; this.card = card; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java index 98533e06..5ef4bd34 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/ResumeNotification.java @@ -13,7 +13,7 @@ public class ResumeNotification extends Notification { * Constructor. * @param color the color of the player that is in the game. */ - ResumeNotification(Color color) { + public ResumeNotification(Color color) { this.color = color; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java index b6bd27c3..3f778d3f 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/RollDiceNotification.java @@ -17,7 +17,7 @@ public class RollDiceNotification extends Notification{ * @param eyes the number of eyes that were rolled. * @param moveNumber the number of the move that was made. */ - RollDiceNotification(Color color, int eyes, int moveNumber) { + public RollDiceNotification(Color color, int eyes, int moveNumber) { this.color = color; this.eyes = eyes; this.moveNumber = moveNumber; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java index 925bde75..308edce2 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableCardsNotification.java @@ -14,7 +14,7 @@ public class SelectableCardsNotification extends Notification { * Constructor. * @param cards The list of cards that the player can choose from. */ - SelectableCardsNotification(List cards) { + public SelectableCardsNotification(List cards) { this.cards = cards; } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java index f2458c14..3e72cc29 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/StartDialogNotification.java @@ -7,6 +7,6 @@ public class StartDialogNotification extends Notification{ /** * Constructor */ - StartDialogNotification() { + public StartDialogNotification() { } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java index 5b99f0e7..2d0f1c49 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskSelectNotification.java @@ -9,18 +9,15 @@ public class TskSelectNotification extends Notification{ private Color color; private String name; - private boolean self; /** * Constructor. * @param color the color of the player that is in the game. * @param name the name of the player that is in the game. - * @param self true if it was the local player selecting the tsk, false otherwise */ - TskSelectNotification(Color color, String name, boolean self) { + public TskSelectNotification(Color color, String name) { this.color = color; this.name = name; - this.self = self; } /** @@ -38,12 +35,4 @@ public Color getColor() { public String getName() { return name; } - - /** - * Tells if it was the local player selecting this tsk. - * @return ture if it was the local player selecting the tsk. - */ - public boolean isSelf() { - return self; - } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java b/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java index 0f96beb1..4a036d46 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/notification/TskUnselectNotification.java @@ -10,7 +10,7 @@ public class TskUnselectNotification extends Notification{ * Constructor * @param color */ - TskUnselectNotification(Color color){ + public TskUnselectNotification(Color color){ this.color = color; }