From c461d67d345586e1b2c8616862a71c49f257a946 Mon Sep 17 00:00:00 2001
From: ingmargoudt <ingmargoudt@gmail.com>
Date: Tue, 4 Apr 2017 21:59:26 +0200
Subject: [PATCH] put disconnect reason message in enum

---
 .../main/java/mage/server/ChatSession.java    | 27 +++----------------
 .../java/mage/server/DisconnectReason.java    | 23 +++++++++++-----
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/Mage.Server/src/main/java/mage/server/ChatSession.java b/Mage.Server/src/main/java/mage/server/ChatSession.java
index 6c016cc7ca5..f7a9c969fbb 100644
--- a/Mage.Server/src/main/java/mage/server/ChatSession.java
+++ b/Mage.Server/src/main/java/mage/server/ChatSession.java
@@ -85,30 +85,9 @@ public class ChatSession {
                     clients.remove(userId);
                     logger.debug(userName + '(' + reason.toString() + ')' + " removed from chatId " + chatId);
                 }
-                String message;
-                switch (reason) {
-                    case Disconnected:
-                        message = " has left XMage";
-                        break;
-                    case LostConnection:
-                        message = " has lost connection";
-                        break;
-                    case SessionExpired:
-                        message = " session expired";
-                        break;
-                    case AdminDisconnect:
-                        message = " was disconnected by the Admin";
-                        break;
-                    case ConnectingOtherInstance:
-                        message = " reconnected and replaced still active old session";
-                        break;
-                    case CleaningUp:
-                        message = null;
-                        break;
-                    default:
-                        message = " left (" + reason.toString() + ')';
-                }
-                if (message != null) {
+                String message = reason.getMessage();
+
+                if (!message.isEmpty()) {
                     broadcast(null, userName + message, MessageColor.BLUE, true, MessageType.STATUS, null);
                 }
             }
diff --git a/Mage.Server/src/main/java/mage/server/DisconnectReason.java b/Mage.Server/src/main/java/mage/server/DisconnectReason.java
index aa7e1503bcd..576c64f2c7e 100644
--- a/Mage.Server/src/main/java/mage/server/DisconnectReason.java
+++ b/Mage.Server/src/main/java/mage/server/DisconnectReason.java
@@ -6,11 +6,20 @@ package mage.server;
  */
 
 public enum DisconnectReason {
-    LostConnection,
-    Disconnected,
-    CleaningUp,
-    ConnectingOtherInstance,
-    AdminDisconnect,
-    SessionExpired,
-    Undefined
+    LostConnection(" has lost connection"),
+    Disconnected(" has left XMage"),
+    CleaningUp(" [cleaning up]"),
+    ConnectingOtherInstance(" reconnected and replaced still active old session"),
+    AdminDisconnect(" was disconnected by the Admin"),
+    SessionExpired(" session expired"),
+    Undefined("");
+
+    String message;
+    DisconnectReason(String message){
+        this.message = message;
+    }
+
+    public String getMessage(){
+        return message;
+    }
 }