From 141a4783b92733e73f3f7be5de5f63715b74966e Mon Sep 17 00:00:00 2001
From: Jonas <jonas.biedermann@stud.unibas.ch>
Date: Sun, 27 Mar 2022 13:29:02 +0200
Subject: [PATCH] Formatting of how chat messages are displayed, too short a
 protocol message doesnt print exception stack trace.

---
 .../multiplayer/client/JClientProtocolParser.java   |  2 +-
 .../cs108/multiplayer/helpers/ClientPinger.java     |  6 ++----
 .../cs108/multiplayer/helpers/ServerPinger.java     |  4 +---
 .../cs108/multiplayer/server/ClientHandler.java     | 13 +------------
 .../multiplayer/server/JServerProtocolParser.java   |  2 +-
 5 files changed, 6 insertions(+), 21 deletions(-)

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 d94dd5b..0c9fbba 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
@@ -14,7 +14,7 @@ public class JClientProtocolParser {
     try {
       header = msg.substring(0, 5);
     } catch (IndexOutOfBoundsException e) {
-      e.printStackTrace();
+      System.out.println("Received unknown command");
     }
     //System.out.println(header);     helpful for debugging
     switch (header) {
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 902cc88..7b5b147 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
@@ -49,10 +49,8 @@ public class ClientPinger implements Runnable {
           }
         }
       }
-      isConnected = false;                 //in case the socket accidentally disconnects (can this happen?)
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
+      isConnected = false;         //in case the socket accidentally disconnects (can this happen?)
+    } catch (InterruptedException | IOException e) {
       e.printStackTrace();
     }
   }
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 0b2f6c7..db703a8 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
@@ -50,9 +50,7 @@ public class ServerPinger implements Runnable {
         }
       }
       isConnected = false;        //in case the socket accidentally disconnects (can this happen?)
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
+    } catch (InterruptedException | IOException e) {
       e.printStackTrace();
     }
   }
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 ab41618..6b204bf 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
@@ -94,18 +94,7 @@ public class ClientHandler implements Runnable {
 
   public void broadcastMessage(String msg) {
     for (ClientHandler client : connectedClients) {
-      try {
-        if (!client.clientUserName.equals((clientUserName))) {
-          client.out.write("CHATM:" + msg);
-        } else {
-          client.out.write("CHATM:Message: **" + msg + "** sent!");
-        }
-        client.out.newLine();
-        client.out.flush();
-      } catch (IOException e) {
-        e.printStackTrace();
-        closeEverything(socket, in, out);
-      }
+      client.sendMsgToClient("CHATM:" + clientUserName + ": \"" + msg + "\"");
     }
   }
 
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 5abcbe1..72adbea 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
@@ -14,7 +14,7 @@ public class JServerProtocolParser {
     try {
       header = msg.substring(0, 5);
     } catch (IndexOutOfBoundsException e) {
-      e.printStackTrace();
+      System.out.println("Received unknown command");
     }
     //System.out.println(header); helpful for debugging
     switch (header) {