From 4f44ab2f3bbe71561ff471076bf0d5f6568ee23e Mon Sep 17 00:00:00 2001 From: Seraina Date: Thu, 31 Mar 2022 13:40:55 +0200 Subject: [PATCH] Added a logger instance LOGGER to all classes --- .../ch/unibas/dmi/dbis/cs108/Klassenstruktur/Ghost.java | 6 ++++++ .../ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostNPC.java | 6 ++++++ .../unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java | 5 +++++ .../ch/unibas/dmi/dbis/cs108/Klassenstruktur/Human.java | 6 ++++++ .../ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanNPC.java | 6 ++++++ .../unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java | 5 +++++ .../ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java | 5 +++++ .../ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/Game.java | 3 +++ .../dmi/dbis/cs108/Spiellogikentwurf/GameFunctions.java | 5 +++++ .../ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java | 6 ++++++ .../cs108/multiplayer/client/JClientProtocolParser.java | 5 +++++ .../dmi/dbis/cs108/multiplayer/client/MessageFormatter.java | 6 ++++++ .../dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java | 5 +++++ .../dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java | 5 +++++ .../dmi/dbis/cs108/multiplayer/server/AllClientNames.java | 6 ++++++ .../dmi/dbis/cs108/multiplayer/server/ClientHandler.java | 5 +++++ .../cs108/multiplayer/server/JServerProtocolParser.java | 6 ++++++ .../dmi/dbis/cs108/multiplayer/server/NameGenerator.java | 5 +++++ .../ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java | 5 +++++ 19 files changed, 101 insertions(+) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Ghost.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Ghost.java index 45b5f2d..3527dfe 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Ghost.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Ghost.java @@ -1,6 +1,12 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class Ghost extends Passenger { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); protected boolean isOG; //true if the Ghost is the original ghost. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostNPC.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostNPC.java index 58b014e..f40f160 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostNPC.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostNPC.java @@ -1,6 +1,12 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class GhostNPC extends Ghost { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Creates a new GhostNPC. Should be used at game start or if a HumanNPC is turned into a ghost. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java index 24657c8..4371e89 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/GhostPlayer.java @@ -1,8 +1,13 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class GhostPlayer extends Ghost { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Creates a new GhostPlayer. Should be used at game start or if a HumanPlayer is turned into a diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Human.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Human.java index e3cd48c..16b42fe 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Human.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Human.java @@ -1,5 +1,11 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class Human extends Passenger { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanNPC.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanNPC.java index 7b789a6..0a0e7cb 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanNPC.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanNPC.java @@ -1,6 +1,12 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class HumanNPC extends Human { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Creates a new HumanNPC. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java index 7a41a22..57027dd 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/HumanPlayer.java @@ -1,8 +1,13 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class HumanPlayer extends Human { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Creates a new GhostPlayer. Should be used at game start or if a HumanPlayer is turned into a diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java index b8dd656..a4fccdb 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Klassenstruktur/Passenger.java @@ -1,8 +1,13 @@ package ch.unibas.dmi.dbis.cs108.Klassenstruktur; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Passenger { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); protected int position; //the player's Cabin number (0 to 5) protected String name; //the player's Name diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/Game.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/Game.java index 6542a4f..a8984b0 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/Game.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/Game.java @@ -1,9 +1,12 @@ package ch.unibas.dmi.dbis.cs108.Spiellogikentwurf; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import org.apache.logging.log4j.*; public class Game { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Can be extended for optional Game-settings diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/GameFunctions.java b/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/GameFunctions.java index c48e1b2..ef95f45 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/GameFunctions.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/Spiellogikentwurf/GameFunctions.java @@ -1,9 +1,14 @@ package ch.unibas.dmi.dbis.cs108.Spiellogikentwurf; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.Klassenstruktur.Human; import ch.unibas.dmi.dbis.cs108.Klassenstruktur.Passenger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class GameFunctions { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Can be extended for optional Game-settings diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java index 1db7ca8..06c3587 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java @@ -1,14 +1,20 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.client; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.ClientPinger; + import java.net.Socket; import java.io.*; import java.net.UnknownHostException; import java.util.Scanner; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Client { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); private Socket socket; private BufferedReader in; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java index 91f0c4e..935fe90 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java @@ -1,8 +1,13 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.client; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.server.ClientHandler; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JClientProtocolParser { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Used by the client to parse an incoming protocol message. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java index 683a6f4..3ca9776 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/MessageFormatter.java @@ -1,6 +1,12 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.client; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class MessageFormatter { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Takes a given Message and reformats it to where the JServerProtocolParser.parse() method can diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java index c09352a..f955428 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java @@ -1,8 +1,11 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.helpers; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import java.io.BufferedWriter; import java.io.IOException; import java.net.Socket; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Sends a ping to the server ("CPING") every 2 seconds and checks if it has gotten a pingback. The @@ -10,6 +13,8 @@ import java.net.Socket; * how the client receives and parses messages. */ public class ClientPinger implements Runnable { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); private boolean gotPingBack; //should be set to true when client gets a pingback. private boolean isConnected; //set to true unless the ClientPinger detects a connection loss. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java index a041732..5ed80ac 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ServerPinger.java @@ -1,8 +1,11 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.helpers; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import java.io.BufferedWriter; import java.io.IOException; import java.net.Socket; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Sends a ping to the client ("SPING") every 2 seconds and checks if it has gotten a pingback. The @@ -10,6 +13,8 @@ import java.net.Socket; * how the server receives and parses messages. */ public class ServerPinger implements Runnable { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); private boolean gotPingBack; //should be set to true (via setGotPingBack) as soon as the server gets a pingback. private boolean isConnected; //set to true unless the ServerPinger detects a connection loss. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/AllClientNames.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/AllClientNames.java index be0c206..1eac350 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/AllClientNames.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/AllClientNames.java @@ -1,5 +1,9 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.server; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + /** * This class is built to contain the usernames of all players in a single string. This allows a * duplicate check (ClientHandler) when a new player chooses a name: does the string with all @@ -8,6 +12,8 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.server; */ public class AllClientNames { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); static StringBuilder names = new StringBuilder(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java index 6b58179..7dbcede 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java @@ -1,12 +1,17 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.server; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.ServerPinger; import java.io.*; import java.net.Socket; import java.util.HashSet; import java.util.Scanner; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ClientHandler implements Runnable { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); private String clientUserName; private BufferedWriter out; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java index c82ec9d..00f838e 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java @@ -1,7 +1,13 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.server; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class JServerProtocolParser { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Used by the server (i.e. ClientHandler) to parse an incoming protocol message. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NameGenerator.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NameGenerator.java index 8b2c30f..eea402e 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NameGenerator.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/NameGenerator.java @@ -1,9 +1,14 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.server; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import java.util.Random; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class NameGenerator { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); /** * Creates a random alteration of a Name by adding 4 numbers at the end of the Name that shall be diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java index 4bcc58a..7efb211 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/Server.java @@ -1,12 +1,17 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.server; +import ch.unibas.dmi.dbis.cs108.BudaLogConfig; import java.io.*; import java.net.ServerSocket; import java.net.Socket; import java.util.HashSet; import java.util.Scanner; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Server { + public static final Logger LOGGER = LogManager.getLogger(); + public static final BudaLogConfig l = new BudaLogConfig(LOGGER); private static final int gamePort = 42069; private HashSet connectedClients = new HashSet<>();